diff --git a/Dockerfile b/Dockerfile
index 41b0a1ef3..486b9bc8c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -112,7 +112,7 @@ FROM quay.io/testnetworkfunction/oct:latest AS db
 
 # Copy the state into a new flattened image to reduce size.
 # TODO run as non-root
-FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4-949.1714662671@sha256:2636170dc55a0931d013014a72ae26c0c2521d4b61a28354b3e2e5369fa335a3
+FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4-1194@sha256:104cf11d890aeb7dd5728b7d7732e175a0e4018f1bb00d2faebcc8f6bf29bd52
 
 ENV \
 	TNF_DIR=/usr/tnf \
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 || {