diff --git a/.github/workflows/pre-main.yaml b/.github/workflows/pre-main.yaml
index 6c559ed83..0d80dcc66 100644
--- a/.github/workflows/pre-main.yaml
+++ b/.github/workflows/pre-main.yaml
@@ -509,7 +509,7 @@ jobs:
           password: ${{ secrets.QUAY_ROBOT_TOKEN }}
 
       - name: Build and push the unstable images for multi-arch
-        uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
+        uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
         if: ${{ github.ref == 'refs/heads/main' && github.repository_owner == 'test-network-function' }}
         with:
           context: .
diff --git a/.github/workflows/qe-hosted.yml b/.github/workflows/qe-hosted.yml
index 79aa29407..7fe47e9c8 100644
--- a/.github/workflows/qe-hosted.yml
+++ b/.github/workflows/qe-hosted.yml
@@ -33,7 +33,7 @@ jobs:
         uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
 
       - name: Build temporary image tag for this PR
-        uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
+        uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
         with:
           context: .
           file: ./Dockerfile
diff --git a/.github/workflows/tnf-image.yaml b/.github/workflows/tnf-image.yaml
index b5e28adcd..dcf107112 100644
--- a/.github/workflows/tnf-image.yaml
+++ b/.github/workflows/tnf-image.yaml
@@ -134,7 +134,7 @@ jobs:
           password: ${{ secrets.QUAY_ROBOT_TOKEN }}
 
       - name: Build and push the TNF image for multi-arch
-        uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
+        uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
         with:
           context: .
           file: Dockerfile
diff --git a/run-basic-batch-operators-test.sh b/run-basic-batch-operators-test.sh
index 4adc84bac..66cfd8cc8 100755
--- a/run-basic-batch-operators-test.sh
+++ b/run-basic-batch-operators-test.sh
@@ -452,6 +452,11 @@ while IFS=, read -r package_name catalog; do
 
 	echo_color "$BLUE" "operator $package_name installed"
 
+	echo_color "$BLUE" "Wait to ensure all pods are running"
+	# Extra wait to ensure that all pods are running
+	sleep 30
+
+	echo_color "$BLUE" "Label deployments, statefulsets, pods"
 	# Label deployments, statefulsets and pods with "test-network-function.com/generic=target"
 	{
 		oc get deployment -n "$ns" -o custom-columns=':.metadata.name,:.metadata.namespace,:.kind' | sed '/^ *$/d' | awk '{print "  oc label " $3  " -n " $2 " " $1  " test-network-function.com/generic=target "}' | bash || true
@@ -459,10 +464,6 @@ while IFS=, read -r package_name catalog; do
 		oc get pods -n "$ns" -o custom-columns=':.metadata.name,:.metadata.namespace,:.kind' | sed '/^ *$/d' | awk '{print "  oc label " $3  " -n " $2 " " $1  " test-network-function.com/generic=target "}' | bash || true
 	} >>"$LOG_FILE_PATH" 2>&1
 
-	echo_color "$BLUE" "Wait to ensure all pods are running"
-	# Extra wait to ensure that all pods are running
-	sleep 30
-
 	# run tnf-container
 	echo_color "$BLUE" "run CNF suite"
 	TNF_LOG_LEVEL=trace ./run-tnf-container.sh -k "$KUBECONFIG" -t "$report_dir" -o "$report_dir" -c "$DOCKER_CONFIG" -l all >>"$LOG_FILE_PATH" 2>&1 || {