diff --git a/.pipelines/cni/cilium/nightly-release-test.yml b/.pipelines/cni/cilium/nightly-release-test.yml
index 9cb7acc9ae..a1eb33c949 100644
--- a/.pipelines/cni/cilium/nightly-release-test.yml
+++ b/.pipelines/cni/cilium/nightly-release-test.yml
@@ -28,6 +28,9 @@ stages:
               cd .pipelines/
               git clone https://github.com/cilium/cilium.git
               cd cilium
+              if [ ! -z $CILIUM_COMMIT_ID ]; then
+                git reset --hard $CILIUM_COMMIT_ID
+              fi
               make docker-cilium-image
               make docker-operator-generic-image
             name: BuildCiliumImage
@@ -100,12 +103,18 @@ stages:
               clusterName: ciliumnightly-$(commitID)
               os: linux
               cni: cilium
+
+  - stage: delete
+    displayName: Delete Clusters
+    condition: always()
+    dependsOn:
+      - setup
+      - cilium_nightly
+    variables:
+      commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
+    jobs:
       - job: delete
         displayName: Delete Cluster
-        condition: always()
-        dependsOn:
-          - cilium_nightly
-          - logs
         pool:
           name: "$(BUILD_POOL_NAME_DEFAULT)"
         strategy:
@@ -119,4 +128,3 @@ stages:
               name: $(name)
               clusterName: $(clusterName)-$(commitID)
               region: $(LOCATION)
-