diff --git a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__metal-4.15-nightly-x86.yaml b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__metal-4.15-nightly-x86.yaml
new file mode 100644
index 000000000000..f0073f1c8dfd
--- /dev/null
+++ b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__metal-4.15-nightly-x86.yaml
@@ -0,0 +1,43 @@
+build_root:
+  image_stream_tag:
+    name: ci-tools-build-root
+    namespace: ci
+    tag: latest
+images:
+- dockerfile_path: prow/Dockerfile
+  to: ocp-qe-perfscale-ci-metal-415
+promotion:
+  to:
+  - namespace: ci
+    tag: latest
+releases:
+  latest:
+    candidate:
+      product: ocp
+      stream: nightly
+      version: "4.15"
+resources:
+  '*':
+    requests:
+      cpu: 100m
+      memory: 200Mi
+tests:
+- always_run: false
+  as: node-density-heavy-6nodes
+  cluster: build05
+  steps:
+    cluster_profile: metal-perscale-cpt
+    env:
+      BAREMETAL: "true"
+      NUM_WORKER_NODES: "6"
+      RUN_CERBERUS: "false"
+    test:
+    - chain: openshift-qe-installer-bm-ping
+    - chain: openshift-qe-installer-bm-deploy
+    - chain: openshift-qe-node-density-heavy
+  timeout: 7h0m0s
+zz_generated_metadata:
+  branch: main
+  org: openshift-qe
+  repo: ocp-qe-perfscale-ci
+  variant: metal-4.15-nightly-x86
diff --git a/ci-operator/jobs/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main-postsubmits.yaml b/ci-operator/jobs/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main-postsubmits.yaml
index 2e0eac59dded..6ee44a877263 100644
--- a/ci-operator/jobs/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main-postsubmits.yaml
+++ b/ci-operator/jobs/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main-postsubmits.yaml
@@ -1701,6 +1701,69 @@ postsubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^main$
+    cluster: build03
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/is-promotion: "true"
+      ci-operator.openshift.io/variant: metal-4.15-nightly-x86
+      ci.openshift.io/generator: prowgen
+      job-release: "4.15"
+    max_concurrency: 1
+    name: branch-ci-openshift-qe-ocp-qe-perfscale-ci-main-metal-4.15-nightly-x86-images
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
+        - --promote
+        - --report-credentials-file=/etc/report/credentials
+        - --target=[images]
+        - --variant=metal-4.15-nightly-x86
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /secrets/manifest-tool
+          name: manifest-tool-local-pusher
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/push-secret
+          name: push-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: manifest-tool-local-pusher
+        secret:
+          secretName: manifest-tool-local-pusher
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: push-secret
+        secret:
+          secretName: registry-push-credentials-ci-central
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main-presubmits.yaml b/ci-operator/jobs/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main-presubmits.yaml
index 0426017b8969..fa8d69ca822e 100644
--- a/ci-operator/jobs/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main-presubmits.yaml
+++ b/ci-operator/jobs/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main-presubmits.yaml
@@ -10790,6 +10790,149 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )(ibmcloud-4.16-nightly-x86-ingress-perf-40nodes|remaining-required),?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^main$
+    - ^main-
+    cluster: build02
+    context: ci/prow/metal-4.15-nightly-x86-images
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/variant: metal-4.15-nightly-x86
+      ci.openshift.io/generator: prowgen
+      job-release: "4.15"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-qe-ocp-qe-perfscale-ci-main-metal-4.15-nightly-x86-images
+    rerun_command: /test metal-4.15-nightly-x86-images
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --report-credentials-file=/etc/report/credentials
+        - --target=[images]
+        - --variant=metal-4.15-nightly-x86
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /secrets/manifest-tool
+          name: manifest-tool-local-pusher
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: manifest-tool-local-pusher
+        secret:
+          secretName: manifest-tool-local-pusher
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )metal-4.15-nightly-x86-images,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^main$
+    - ^main-
+    cluster: build05
+    context: ci/prow/metal-4.15-nightly-x86-node-density-heavy-6nodes
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+      timeout: 7h0m0s
+    labels:
+      ci-operator.openshift.io/cloud: metal-perscale-cpt
+      ci-operator.openshift.io/cloud-cluster-profile: metal-perscale-cpt
+      ci-operator.openshift.io/cluster: build05
+      ci-operator.openshift.io/variant: metal-4.15-nightly-x86
+      ci.openshift.io/generator: prowgen
+      job-release: "4.15"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-qe-ocp-qe-perfscale-ci-main-metal-4.15-nightly-x86-node-density-heavy-6nodes
+    rerun_command: /test metal-4.15-nightly-x86-node-density-heavy-6nodes
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/node-density-heavy-6nodes-cluster-profile
+        - --target=node-density-heavy-6nodes
+        - --variant=metal-4.15-nightly-x86
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/node-density-heavy-6nodes-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /secrets/manifest-tool
+          name: manifest-tool-local-pusher
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-metal-perscale-cpt
+      - name: manifest-tool-local-pusher
+        secret:
+          secretName: manifest-tool-local-pusher
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )(metal-4.15-nightly-x86-node-density-heavy-6nodes|remaining-required),?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/step-registry/openshift-qe/installer/bm/deploy/OWNERS b/ci-operator/step-registry/openshift-qe/installer/bm/deploy/OWNERS
new file mode 120000
index 000000000000..8c272259fbba
--- /dev/null
+++ b/ci-operator/step-registry/openshift-qe/installer/bm/deploy/OWNERS
@@ -0,0 +1 @@
+../../OWNERS
\ No newline at end of file
diff --git a/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-chain.metadata.json b/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-chain.metadata.json
new file mode 100644
index 000000000000..1bc156bf8138
--- /dev/null
+++ b/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-chain.metadata.json
@@ -0,0 +1,31 @@
+{
+	"path": "openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-chain.yaml",
+	"owners": {
+		"approvers": [
+			"qiliredhat",
+			"paigerube14",
+			"mffiedler",
+			"jtaleric",
+			"svetsa-rh"
+		],
+		"reviewers": [
+			"jogeo",
+			"memodi",
+			"mffiedler",
+			"paigerube14",
+			"rpattath",
+			"skordas",
+			"jtaleric",
+			"svetsa-rh",
+			"shahsahil264",
+			"liqcui",
+			"krishvoor",
+			"afcollins",
+			"rsevilla87",
+			"vishnuchalla",
+			"sachinninganure",
+			"chaitanyaenr",
+			"josecastillolema"
+		]
+	}
+}
\ No newline at end of file
diff --git a/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-chain.yaml b/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-chain.yaml
new file mode 100644
index 000000000000..3277df988143
--- /dev/null
+++ b/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-chain.yaml
@@ -0,0 +1,6 @@
+chain:
+  as: openshift-qe-installer-bm-deploy
+  steps:
+  - ref: openshift-qe-installer-bm-deploy
+  documentation: |-
+    Test connectivity to the bastion host 
\ No newline at end of file
diff --git a/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-commands.sh b/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-commands.sh
new file mode 100644
index 000000000000..490d813d5d3c
--- /dev/null
+++ b/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-commands.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+set -o errexit
+set -o nounset
+set -o pipefail
+set -x
+
+
+# Fix UID issue (from Telco QE Team)
+~/fix_uid.sh
+
+bastion=$(cat "/secret/address")
+
+cat <<EOF >>/tmp/all.yml
+---
+lab: scalelab
+lab_cloud:
+cluster_type: $TYPE
+worker_node_count: $NUM_WORKER_NODES
+sno_node_count:
+public_vlan: false
+ocp_release_image: $OCP_RELEASE_IMAGE
+openshift_version: "$OCP_VERSION_SHORT"
+networktype: OVNKubernetes
+enable_fips: $FIPS
+ssh_private_key_file: ~/.ssh/id_rsa
+ssh_public_key_file: ~/.ssh/id_rsa.pub
+pull_secret: "{{ lookup('file', '../pull_secret.txt') }}"
+bastion_cluster_config_dir: /root/{{ cluster_type }}
+smcipmitool_url:
+bastion_lab_interface: eno12399
+bastion_controlplane_interface: ens6f0
+controlplane_network: 192.168.216.1/21
+controlplane_network_prefix: 21
+bastion_vlaned_interface: ens1f1
+setup_bastion_gogs: false
+setup_bastion_registry: false
+use_bastion_registry: false
+controlplane_lab_interface: eno1np0
+controlplane_pub_network_cidr:
+controlplane_pub_network_gateway:
+jumbo_mtu: false
+rwn_lab_interface: eno1np0
+rwn_network_interface: ens1f0
+EOF
+
+envsubst < /tmp/all.yml > /tmp/all-updated.yml
+
+sshpass -p "$(cat /secret/login)" scp -q -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null /tmp/all-updated.yml root@${bastion}:~/jetlag/ansible/vars/all.yml
+sshpass -p "$(cat /secret/login)" scp -q -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null /secret/inventory root@${bastion}:~/jetlag/ansible/inventory/telco.inv
+
+# Clean up previous attempts
+sshpass -p "$(cat /secret/login)" ssh -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null root@${bastion} "./clean-resources.sh"
+
+# Setup Bastion
+sshpass -p "$(cat /secret/login)" ssh -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null root@${bastion} "cd jetlag; source bootstrap.sh; ansible-playbook -i ansible/inventory/telco.inv ansible/setup-bastion.yml"
+
+# Attempt Deployment
+sshpass -p "$(cat /secret/login)" ssh -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null root@${bastion} "cd jetlag; source bootstrap.sh; ansible-playbook -i ansible/inventory/telco.inv ansible/bm-deploy.yml -v"
\ No newline at end of file
diff --git a/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-ref.metadata.json b/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-ref.metadata.json
new file mode 100644
index 000000000000..54945002d99d
--- /dev/null
+++ b/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-ref.metadata.json
@@ -0,0 +1,31 @@
+{
+	"path": "openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-ref.yaml",
+	"owners": {
+		"approvers": [
+			"qiliredhat",
+			"paigerube14",
+			"mffiedler",
+			"jtaleric",
+			"svetsa-rh"
+		],
+		"reviewers": [
+			"jogeo",
+			"memodi",
+			"mffiedler",
+			"paigerube14",
+			"rpattath",
+			"skordas",
+			"jtaleric",
+			"svetsa-rh",
+			"shahsahil264",
+			"liqcui",
+			"krishvoor",
+			"afcollins",
+			"rsevilla87",
+			"vishnuchalla",
+			"sachinninganure",
+			"chaitanyaenr",
+			"josecastillolema"
+		]
+	}
+}
\ No newline at end of file
diff --git a/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-ref.yaml b/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-ref.yaml
new file mode 100644
index 000000000000..2528dd432c4e
--- /dev/null
+++ b/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-ref.yaml
@@ -0,0 +1,36 @@
+ref:
+  as: openshift-qe-installer-bm-deploy
+  from_image:
+    namespace: ci
+    name: telco-bastion
+    tag: latest
+  commands: openshift-qe-installer-bm-deploy-commands.sh
+  credentials:
+  - namespace: test-credentials # this entry injects the custom credential
+    name: perfscale-metal-bastion
+    mount_path: /secret
+  resources:
+    requests:
+      cpu: 100m
+      memory: 100Mi
+  env:
+  - name: OCP_VERSION_SHORT
+    default: "4.15"
+    documentation: |-
+     Short Version.
+  - name: OCP_RELEASE_IMAGE
+    default: "quay.io/openshift-release-dev/ocp-release:4.15.2-x86_64"
+    documentation: |-
+     URL to install image
+  - name: TYPE
+    default: "bm"
+    documentation: |-
+     BM, SNO or RWN.
+  - name: NUM_WORKER_NODES
+    default: "1"
+    documentation: |-
+      Number of worker nodes
+  - name: FIPS
+    default: "false"
+    documentation: |-
+      Enable or disable fips 
\ No newline at end of file
diff --git a/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-workflow.metadata.json b/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-workflow.metadata.json
new file mode 100644
index 000000000000..0fc66efd44d2
--- /dev/null
+++ b/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-workflow.metadata.json
@@ -0,0 +1,31 @@
+{
+	"path": "openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-workflow.yaml",
+	"owners": {
+		"approvers": [
+			"qiliredhat",
+			"paigerube14",
+			"mffiedler",
+			"jtaleric",
+			"svetsa-rh"
+		],
+		"reviewers": [
+			"jogeo",
+			"memodi",
+			"mffiedler",
+			"paigerube14",
+			"rpattath",
+			"skordas",
+			"jtaleric",
+			"svetsa-rh",
+			"shahsahil264",
+			"liqcui",
+			"krishvoor",
+			"afcollins",
+			"rsevilla87",
+			"vishnuchalla",
+			"sachinninganure",
+			"chaitanyaenr",
+			"josecastillolema"
+		]
+	}
+}
\ No newline at end of file
diff --git a/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-workflow.yaml b/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-workflow.yaml
new file mode 100644
index 000000000000..411ffee97228
--- /dev/null
+++ b/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-workflow.yaml
@@ -0,0 +1,7 @@
+workflow:
+  as:  openshift-qe-installer-bm-deploy
+  steps:
+    test:
+    - chain: openshift-qe-installer-bm-deploy
+  documentation: |-
+    Ping a node to ensure connectivity.
\ No newline at end of file
diff --git a/ci-operator/step-registry/openshift-qe/installer/bm/ping/openshift-qe-installer-bm-ping-commands.sh b/ci-operator/step-registry/openshift-qe/installer/bm/ping/openshift-qe-installer-bm-ping-commands.sh
index d327a45d32d1..6cc341030174 100644
--- a/ci-operator/step-registry/openshift-qe/installer/bm/ping/openshift-qe-installer-bm-ping-commands.sh
+++ b/ci-operator/step-registry/openshift-qe/installer/bm/ping/openshift-qe-installer-bm-ping-commands.sh
@@ -4,6 +4,6 @@ set -o nounset
 set -o pipefail
 set -x
 
-bastion=$(cat "/secret/hostname")
+bastion=$(cat "/secret/address")
 
 ping -c 5 $bastion
\ No newline at end of file
diff --git a/ci-operator/step-registry/openshift-qe/installer/bm/ping/openshift-qe-installer-bm-ping-ref.yaml b/ci-operator/step-registry/openshift-qe/installer/bm/ping/openshift-qe-installer-bm-ping-ref.yaml
index 5efe80a80de0..279fa37dc65d 100644
--- a/ci-operator/step-registry/openshift-qe/installer/bm/ping/openshift-qe-installer-bm-ping-ref.yaml
+++ b/ci-operator/step-registry/openshift-qe/installer/bm/ping/openshift-qe-installer-bm-ping-ref.yaml
@@ -2,7 +2,7 @@ ref:
   as: openshift-qe-installer-bm-ping
   from_image:
     namespace: ci
-    name: ocp-qe-perfscale-ci
+    name: telco-bastion
     tag: latest
   commands: openshift-qe-installer-bm-ping-commands.sh
   credentials:
diff --git a/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-commands.sh b/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-commands.sh
index 15b5c602c5c8..3ef06f8b1d96 100755
--- a/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-commands.sh
+++ b/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-commands.sh
@@ -4,13 +4,27 @@ set -o nounset
 set -o pipefail
 set -x
 cat /etc/os-release
-oc config view
-oc projects
+
+if [ ${BAREMETAL} == "true" ]; then
+  bastion="$(cat /bm/address)"
+  # Copy over the kubeconfig
+  sshpass -p "$(cat /bm/login)" ssh -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null root@$bastion "cat ~/bm/kubeconfig" > /tmp/kubeconfig
+  # Setup socks proxy
+  sshpass -p "$(cat /bm/login)" ssh -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null root@$bastion -fNT -D 12345
+  export KUBECONFIG=/tmp/kubeconfig
+  export https_proxy=socks5://localhost:12345
+  export http_proxy=socks5://localhost:12345
+  oc --kubeconfig=/tmp/kubeconfig config set-cluster bm --proxy-url=socks5://localhost:12345
+  cd /tmp
+fi
 python --version
 pushd /tmp
 python -m virtualenv ./venv_qe
 source ./venv_qe/bin/activate
 
+oc config view
+oc projects
+
 ES_PASSWORD=$(cat "/secret/password")
 ES_USERNAME=$(cat "/secret/username")
 
@@ -37,8 +51,15 @@ export COMPARISON_CONFIG="clusterVersion.json podLatency.json containerMetrics.j
 export GEN_CSV=true
 export EMAIL_ID_FOR_RESULTS_SHEET='ocp-perfscale-qe@redhat.com'
 
-rm -f ${SHARED_DIR}/index.json
+echo ${SHARED_DIR}
+
 ./run.sh
 
 folder_name=$(ls -t -d /tmp/*/ | head -1)
+
 jq ".iterations = $PODS_PER_NODE" $folder_name/index_data.json >> ${SHARED_DIR}/index_data.json
+
+if [ ${BAREMETAL} == "true" ]; then
+  # kill the ssh tunnel so the job completes
+  pkill ssh
+fi
\ No newline at end of file
diff --git a/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-ref.yaml b/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-ref.yaml
index adc34970b7d0..33c583ae347b 100644
--- a/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-ref.yaml
+++ b/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-ref.yaml
@@ -12,6 +12,9 @@ ref:
   - namespace: test-credentials
     name: ocp-qe-gcp-sa
     mount_path: /ga-gsheet
+  - namespace: test-credentials
+    name: perfscale-metal-bastion
+    mount_path: /bm
   env:
   - name: E2E_VERSION
     default: "v2.1.7"
@@ -24,15 +27,19 @@ ref:
   - name: PODS_PER_NODE
     default: "200"
     documentation: |-
-      Define the maximum number of pods to deploy on each labeled node.  
+      Define the maximum number of pods to deploy on each labeled node.
   - name: NAMESPACED_ITERATIONS
     default: "true"
     documentation: |-
-      Run each number of jobs iterations in a distinct namespace. 
+      Run each number of jobs iterations in a distinct namespace.
   - name: ITERATIONS_PER_NAMESPACE
     default: "1000"
     documentation: |-
-      Iterations per namespace. 
+      Iterations per namespace.
+  - name: BAREMETAL
+    default: "false"
+    documentation: |-
+      Set to true if the job is for baremetal
   - name: EXTRA_FLAGS
     default: ""
     documentation: |-