diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml
index 4cded456dcc62..a0ad67724413f 100644
--- a/ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml
+++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml
@@ -191,8 +191,6 @@ objects:
         value: /etc/openshift-installer/matchbox-client.crt
       - name: MATCHBOX_CLIENT_KEY
         value: /etc/openshift-installer/matchbox-client.key
-      - name: RHCOS_BUILD_ID
-        value: "410.8.20190401.0"
       - name: CLUSTER_NAME
         value: ${NAMESPACE}-${JOB_NAME_HASH}
       - name: BASE_DOMAIN
@@ -261,6 +259,9 @@ objects:
         cp -r /var/lib/openshift-install/upi/metal/* /tmp/artifacts/terraform/
         cp /bin/terraform-provider-matchbox /tmp/artifacts/terraform/
 
+        PXE_INITRD_URL="$(jq -r '.baseURI + .images["initramfs"].path' /var/lib/openshift-install/rhcos.json)"
+        PXE_KERNEL_URL="$(jq -r '.baseURI + .images["kernel"].path' /var/lib/openshift-install/rhcos.json)"
+        PXE_OS_IMAGE_URL="$(jq -r '.baseURI + .images["metal-bios"].path' /var/lib/openshift-install/rhcos.json)"
         cat > /tmp/artifacts/terraform/terraform.tfvars <<-EOF
         cluster_id = "${CLUSTER_NAME}"
         bootstrap_ign_file = "/tmp/artifacts/installer/bootstrap.ign"
@@ -274,9 +275,9 @@ objects:
         matchbox_trusted_ca_cert = "/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
         packet_project_id = "${PACKET_PROJECT_ID}"
         public_r53_zone = "${BASE_DOMAIN}"
-        pxe_initrd_url = "https://releases-rhcos.svc.ci.openshift.org/storage/releases/ootpa/${RHCOS_BUILD_ID}/rhcos-${RHCOS_BUILD_ID}-installer-initramfs.img"
-        pxe_kernel_url = "https://releases-rhcos.svc.ci.openshift.org/storage/releases/ootpa/${RHCOS_BUILD_ID}/rhcos-${RHCOS_BUILD_ID}-installer-kernel"
-        pxe_os_image_url = "https://releases-rhcos.svc.ci.openshift.org/storage/releases/ootpa/${RHCOS_BUILD_ID}/rhcos-${RHCOS_BUILD_ID}-metal-bios.raw"
+        pxe_initrd_url = "${PXE_INITRD_URL}"
+        pxe_kernel_url = "${PXE_KERNEL_URL}"
+        pxe_os_image_url = "${PXE_OS_IMAGE_URL}"
         worker_count = "3"
         worker_ign_file = "/tmp/artifacts/installer/worker.ign"
         EOF
@@ -375,7 +376,7 @@ objects:
 
           if [ -f /tmp/artifacts/terraform/terraform.tfstate ]
           then
-              bootstrap_ip=$(terraform output -json | jq -r '.bootstrap_ip.value')
+              bootstrap_ip=$(terraform output -state /tmp/artifacts/terraform/terraform.tfstate -json | jq -r '.bootstrap_ip.value')
 
               if [ -n "${bootstrap_ip}" ]
               then