diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.12.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.12.yaml
index 2fc573098028e..23beb30e7ce6c 100644
--- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.12.yaml
+++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.12.yaml
@@ -301,66 +301,67 @@ tests:
     workflow: openshift-e2e-azure-ovn
 - as: ocp-e2e-ovn-remote-libvirt-s390x
   capabilities:
-  - sshd-bastion
+  - intranet
   cron: 0 0 24 12 *
   steps:
-    cluster_profile: libvirt-s390x-2
+    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.12"
-      BUTANE_RELEASE: 4.12.0
+      BUTANE_RELEASE: "4.12.0"
       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 27 12 *
   steps:
-    cluster_profile: libvirt-s390x-2
+    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.12"
-      BUTANE_RELEASE: 4.12.0
+      BUTANE_RELEASE: "4.12.0"
       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 29 12 *
   steps:
-    cluster_profile: libvirt-s390x-2
+    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.12"
-      BUTANE_RELEASE: 4.12.0
+      BUTANE_RELEASE: "4.12.0"
       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 0 30 12 *
   steps:
-    cluster_profile: libvirt-s390x-2
+    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.12"
-      BUTANE_RELEASE: 4.12.0
+      BUTANE_RELEASE: "4.12.0"
       FIPS_ENABLED: "true"
       NODE_TUNING: "true"
       TEST_TYPE: conformance-parallel
-    pre:
-    - chain: ipi-libvirt-pre
-    - ref: fips-check
-    workflow: openshift-e2e-libvirt
+      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.13-upgrade-from-nightly-4.12.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.13-upgrade-from-nightly-4.12.yaml
index 7fe0027ffef38..99caba1ae632c 100644
--- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.13-upgrade-from-nightly-4.12.yaml
+++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.13-upgrade-from-nightly-4.12.yaml
@@ -138,20 +138,21 @@ tests:
     workflow: openshift-upgrade-aws
 - as: ocp-ovn-remote-libvirt-s390x
   capabilities:
-  - sshd-bastion
+  - intranet
   cron: 0 0 3 1 *
   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.12"
-      BUTANE_RELEASE: 4.12.0
+      BUTANE_RELEASE: "4.12.0"
       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..5c0ddaa3dd3b5 100644
--- a/ci-operator/jobs/openshift/multiarch/openshift-multiarch-main-periodics.yaml
+++ b/ci-operator/jobs/openshift/multiarch/openshift-multiarch-main-periodics.yaml
@@ -4249,7 +4249,7 @@ periodics:
       secret:
         secretName: result-aggregator
 - agent: kubernetes
-  cluster: build01
+  cluster: build12
   cron: 0 0 24 12 *
   decorate: true
   decoration_config:
@@ -4259,9 +4259,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.12
     ci.openshift.io/generator: prowgen
     job-release: "4.12"
@@ -4666,7 +4666,7 @@ periodics:
       secret:
         secretName: result-aggregator
 - agent: kubernetes
-  cluster: build01
+  cluster: build12
   cron: 0 0 29 12 *
   decorate: true
   decoration_config:
@@ -4676,9 +4676,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.12
     ci.openshift.io/generator: prowgen
     job-release: "4.12"
@@ -4917,7 +4917,7 @@ periodics:
       secret:
         secretName: result-aggregator
 - agent: kubernetes
-  cluster: build01
+  cluster: build12
   cron: 0 0 30 12 *
   decorate: true
   decoration_config:
@@ -4927,9 +4927,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.12
     ci.openshift.io/generator: prowgen
     job-release: "4.12"
@@ -5168,7 +5168,7 @@ periodics:
       secret:
         secretName: result-aggregator
 - agent: kubernetes
-  cluster: build01
+  cluster: build12
   cron: 0 0 27 12 *
   decorate: true
   decoration_config:
@@ -5178,9 +5178,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.12
     ci.openshift.io/generator: prowgen
     job-release: "4.12"
@@ -8002,7 +8002,7 @@ periodics:
       secret:
         secretName: result-aggregator
 - agent: kubernetes
-  cluster: build01
+  cluster: build12
   cron: 0 0 3 1 *
   decorate: true
   decoration_config:
@@ -8012,9 +8012,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.13-upgrade-from-nightly-4.12
     ci.openshift.io/generator: prowgen
     job-release: "4.13"