diff --git a/ci-operator/step-registry/hypershift/install/hypershift-install-commands.sh b/ci-operator/step-registry/hypershift/install/hypershift-install-commands.sh
index bab2a9d70dfe4..564e863e74c65 100755
--- a/ci-operator/step-registry/hypershift/install/hypershift-install-commands.sh
+++ b/ci-operator/step-registry/hypershift/install/hypershift-install-commands.sh
@@ -55,6 +55,8 @@ if [ "${TEST_CPO_OVERRIDE}" == "1" ]; then
   EXTRA_ARGS="${EXTRA_ARGS} --enable-cpo-overrides"
 fi
 
+EXTRA_ARGS="${EXTRA_ARGS} --additional-operator-env-vars=IMAGE_KUBEVIRT_CAPI_PROVIDER=registry.ci.openshift.org/ocp/4.18:cluster-api-provider-kubevirt"
+
 case "${CLOUD_PROVIDER}" in
   AWS)
     "${HCP_CLI}" install --hypershift-image="${OPERATOR_IMAGE}" \
@@ -157,16 +159,6 @@ case "${CLOUD_PROVIDER}" in
   oc wait --for=condition=Available --namespace hypershift deployments/operator --timeout=300s
     ;;
 
-  Kubevirt)
-    "${HCP_CLI}" install --hypershift-image="${OPERATOR_IMAGE}" \
-    --additional-operator-env-vars="IMAGE_KUBEVIRT_CAPI_PROVIDER=registry.ci.openshift.org/ocp/4.18:cluster-api-provider-kubevirt" \
-    --platform-monitoring=All \
-    --enable-ci-debug-output \
-    --pull-secret=/etc/ci-pull-credentials/.dockerconfigjson \
-    --wait-until-available \
-    ${EXTRA_ARGS}
-    ;;
-
   *)
     "${HCP_CLI}" install --hypershift-image="${OPERATOR_IMAGE}" \
     --platform-monitoring=All \
diff --git a/ci-operator/step-registry/hypershift/kubevirt/e2e-nested/hypershift-kubevirt-e2e-nested-workflow.yaml b/ci-operator/step-registry/hypershift/kubevirt/e2e-nested/hypershift-kubevirt-e2e-nested-workflow.yaml
index 227fbe93b943d..a8570b471dd01 100644
--- a/ci-operator/step-registry/hypershift/kubevirt/e2e-nested/hypershift-kubevirt-e2e-nested-workflow.yaml
+++ b/ci-operator/step-registry/hypershift/kubevirt/e2e-nested/hypershift-kubevirt-e2e-nested-workflow.yaml
@@ -15,7 +15,6 @@ workflow:
       HYPERSHIFT_ZONES: "us-east-1a"
       RUN_EXTERNAL_INFRA_TEST: "false"
       RUN_HOSTEDCLUSTER_CREATION: "true"
-      CLOUD_PROVIDER: "Kubevirt"
     pre:
       - ref: ipi-install-rbac
       - chain: hypershift-setup-nested-management-cluster