diff --git a/.github/workflows/lab_ipv6_nightly.yml b/.github/workflows/lab_nightly.yml
similarity index 90%
rename from .github/workflows/lab_ipv6_nightly.yml
rename to .github/workflows/lab_nightly.yml
index f9754020..f0c06910 100644
--- a/.github/workflows/lab_ipv6_nightly.yml
+++ b/.github/workflows/lab_nightly.yml
@@ -1,4 +1,4 @@
-name: lab-ztp-nightly
+name: lab-nightly
 on:
   schedule:
     - cron: '31 18 * * *'
@@ -28,7 +28,7 @@ jobs:
       runs-on: libvirt
       steps:
       - name: Deploy kcli plan
-        run: kcli -c local create plan --force -f $INPUTFILE --paramfile $PARAMFILE -P pullsecret=$PULLSECRET $PLAN
+        run: kcli -c local create plan --force -f $INPUTFILE --paramfile $PARAMFILE -P pullsecret=$PULLSECRET -P installer_wait=true $PLAN
       - name: Clean up
         if: always()
         run: kcli -c local delete plan --yes $PLAN
diff --git a/bin/clean.sh b/bin/clean.sh
index cdff4f0d..9764263c 100755
--- a/bin/clean.sh
+++ b/bin/clean.sh
@@ -1,3 +1,6 @@
 #!/usr/bin/env bash
 
+CLUSTER={{ cluster }}
 [ -d /root/ocp ] && rm -rf /root/ocp
+VMS=$(kcli list vm | grep ${CLUSTER}-.*-bootstrap | cut -d"|" -f 2 | xargs)
+[ -z "$VMS" ] || kcli delete vm --yes $VMS
diff --git a/paramfiles/lab_ipv6.yml b/paramfiles/lab_ipv6.yml
index fc95b90a..aff720d7 100644
--- a/paramfiles/lab_ipv6.yml
+++ b/paramfiles/lab_ipv6.yml
@@ -5,7 +5,7 @@ dualstack_cidr: 192.168.130.0/24
 disconnected: true
 virtual_ctlplanes: true
 launch_steps: true
-deploy_openshift: false
+deploy_openshift: true
 version: stable
 tag: "4.15"
 cluster: lab
diff --git a/paramfiles/lab_ztp_ipv6.yml b/paramfiles/lab_ztp_ipv6.yml
index 590cc60d..27e9e284 100644
--- a/paramfiles/lab_ztp_ipv6.yml
+++ b/paramfiles/lab_ztp_ipv6.yml
@@ -38,7 +38,6 @@ lab_extra_dns:
 - assisted-service-multicluster-engine
 - assisted-service-assisted-installer
 - assisted-image-service-multicluster-engine
-installer_wait: true
 #notify: true
 nfs: true
 installer_mac: aa:bb:aa:aa:bb:01