diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.14.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.14.yaml
index 005f5e6a40745..f6f7e264b1273 100644
--- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.14.yaml
+++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.14.yaml
@@ -372,59 +372,63 @@ tests:
     workflow: openshift-upgrade-azure
 - as: ocp-e2e-ovn-remote-libvirt-s390x
   capabilities:
-  - sshd-bastion
+  - intranet
   cron: 0 0 * * 5
   steps:
-    cluster_profile: libvirt-s390x-1
+    cluster_profile: libvirt-s390x-vpn
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:s390x-latest
+      OPENSHIFT_INSTALL_TARGET: release:s390x-latest
     env:
       ARCH: s390x
       BRANCH: "4.14"
       NODE_TUNING: "true"
       TEST_TYPE: conformance-parallel
-    workflow: openshift-e2e-libvirt
+      USE_EXTERNAL_DNS: "true"
+    workflow: openshift-e2e-libvirt-vpn
 - as: ocp-image-ecosystem-ovn-remote-libvirt-s390x
   capabilities:
-  - sshd-bastion
+  - intranet
   cron: 0 0 12 1 *
   steps:
-    cluster_profile: libvirt-s390x-1
+    cluster_profile: libvirt-s390x-vpn
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-latest
+      OPENSHIFT_INSTALL_TARGET: release:s390x-latest
     env:
       ARCH: s390x
       BRANCH: "4.14"
       TEST_TYPE: image-ecosystem
-    workflow: openshift-e2e-libvirt
+      USE_EXTERNAL_DNS: "true"
+    workflow: openshift-e2e-libvirt-vpn
 - as: ocp-e2e-serial-ovn-remote-libvirt-s390x
   capabilities:
-  - sshd-bastion
+  - intranet
   cron: 0 0 14 1 *
   steps:
-    cluster_profile: libvirt-s390x-1
+    cluster_profile: libvirt-s390x-vpn
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:s390x-latest
+      OPENSHIFT_INSTALL_TARGET: release:s390x-latest
     env:
       ARCH: s390x
       BRANCH: "4.14"
       TEST_TYPE: conformance-serial
-    workflow: openshift-e2e-libvirt
+      USE_EXTERNAL_DNS: "true"
+    workflow: openshift-e2e-libvirt-vpn
 - as: ocp-fips-ovn-remote-libvirt-s390x
   capabilities:
-  - sshd-bastion
+  - intranet
   cron: 0 4 * * 5
   steps:
-    cluster_profile: libvirt-s390x-1
+    cluster_profile: libvirt-s390x-vpn
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:s390x-latest
+      OPENSHIFT_INSTALL_TARGET: release:s390x-latest
     env:
       ARCH: s390x
       BRANCH: "4.14"
       FIPS_ENABLED: "true"
       NODE_TUNING: "true"
       TEST_TYPE: conformance-parallel
-    workflow: openshift-e2e-libvirt-fips
+      USE_EXTERNAL_DNS: "true"
+    workflow: openshift-e2e-libvirt-vpn-fips
 - as: ocp-e2e-ovn-remote-s2s-libvirt-ppc64le
   capabilities:
   - power-s2s-dns
diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.15-upgrade-from-nightly-4.14.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.15-upgrade-from-nightly-4.14.yaml
index 18193244f5ab9..e31e11d401e54 100644
--- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.15-upgrade-from-nightly-4.14.yaml
+++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.15-upgrade-from-nightly-4.14.yaml
@@ -190,19 +190,20 @@ tests:
     workflow: openshift-upgrade-gcp-heterogeneous
 - as: ocp-ovn-remote-libvirt-s390x
   capabilities:
-  - sshd-bastion
+  - intranet
   cron: 0 2 * * 5
   steps:
-    cluster_profile: libvirt-s390x-2
+    cluster_profile: libvirt-s390x-vpn
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:s390x-initial
+      OPENSHIFT_INSTALL_TARGET: release:s390x-initial
       OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:s390x-latest
     env:
       ARCH: s390x
       BRANCH: "4.14"
       NODE_TUNING: "true"
       TEST_TYPE: upgrade
-    workflow: openshift-e2e-libvirt
+      USE_EXTERNAL_DNS: "true"
+    workflow: openshift-e2e-libvirt-vpn
 - as: ocp-ovn-remote-s2s-libvirt-ppc64le
   capabilities:
   - power-s2s-dns
diff --git a/ci-operator/jobs/openshift/multiarch/openshift-multiarch-main-periodics.yaml b/ci-operator/jobs/openshift/multiarch/openshift-multiarch-main-periodics.yaml
index 23f64c05482e6..e56b8b4016dad 100644
--- a/ci-operator/jobs/openshift/multiarch/openshift-multiarch-main-periodics.yaml
+++ b/ci-operator/jobs/openshift/multiarch/openshift-multiarch-main-periodics.yaml
@@ -9582,7 +9582,7 @@ periodics:
       secret:
         secretName: result-aggregator
 - agent: kubernetes
-  cluster: build01
+  cluster: build12
   cron: 0 0 * * 5
   decorate: true
   decoration_config:
@@ -9592,9 +9592,9 @@ periodics:
     org: openshift
     repo: multiarch
   labels:
-    capability/sshd-bastion: sshd-bastion
-    ci-operator.openshift.io/cloud: libvirt-s390x-1
-    ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-1
+    capability/intranet: intranet
+    ci-operator.openshift.io/cloud: libvirt-s390x-vpn
+    ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-vpn
     ci-operator.openshift.io/variant: nightly-4.14
     ci.openshift.io/generator: prowgen
     job-release: "4.14"
@@ -10083,7 +10083,7 @@ periodics:
       secret:
         secretName: result-aggregator
 - agent: kubernetes
-  cluster: build01
+  cluster: build12
   cron: 0 0 14 1 *
   decorate: true
   decoration_config:
@@ -10093,9 +10093,9 @@ periodics:
     org: openshift
     repo: multiarch
   labels:
-    capability/sshd-bastion: sshd-bastion
-    ci-operator.openshift.io/cloud: libvirt-s390x-1
-    ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-1
+    capability/intranet: intranet
+    ci-operator.openshift.io/cloud: libvirt-s390x-vpn
+    ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-vpn
     ci-operator.openshift.io/variant: nightly-4.14
     ci.openshift.io/generator: prowgen
     job-release: "4.14"
@@ -10666,7 +10666,7 @@ periodics:
       secret:
         secretName: result-aggregator
 - agent: kubernetes
-  cluster: build01
+  cluster: build12
   cron: 0 4 * * 5
   decorate: true
   decoration_config:
@@ -10676,9 +10676,9 @@ periodics:
     org: openshift
     repo: multiarch
   labels:
-    capability/sshd-bastion: sshd-bastion
-    ci-operator.openshift.io/cloud: libvirt-s390x-1
-    ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-1
+    capability/intranet: intranet
+    ci-operator.openshift.io/cloud: libvirt-s390x-vpn
+    ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-vpn
     ci-operator.openshift.io/variant: nightly-4.14
     ci.openshift.io/generator: prowgen
     job-release: "4.14"
@@ -10917,7 +10917,7 @@ periodics:
       secret:
         secretName: result-aggregator
 - agent: kubernetes
-  cluster: build01
+  cluster: build12
   cron: 0 0 12 1 *
   decorate: true
   decoration_config:
@@ -10927,9 +10927,9 @@ periodics:
     org: openshift
     repo: multiarch
   labels:
-    capability/sshd-bastion: sshd-bastion
-    ci-operator.openshift.io/cloud: libvirt-s390x-1
-    ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-1
+    capability/intranet: intranet
+    ci-operator.openshift.io/cloud: libvirt-s390x-vpn
+    ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-vpn
     ci-operator.openshift.io/variant: nightly-4.14
     ci.openshift.io/generator: prowgen
     job-release: "4.14"
@@ -15163,7 +15163,7 @@ periodics:
       secret:
         secretName: result-aggregator
 - agent: kubernetes
-  cluster: build01
+  cluster: build12
   cron: 0 2 * * 5
   decorate: true
   decoration_config:
@@ -15173,9 +15173,9 @@ periodics:
     org: openshift
     repo: multiarch
   labels:
-    capability/sshd-bastion: sshd-bastion
-    ci-operator.openshift.io/cloud: libvirt-s390x-2
-    ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-2
+    capability/intranet: intranet
+    ci-operator.openshift.io/cloud: libvirt-s390x-vpn
+    ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-vpn
     ci-operator.openshift.io/variant: nightly-4.15-upgrade-from-nightly-4.14
     ci.openshift.io/generator: prowgen
     job-release: "4.15"