diff --git a/BUILD.bazel b/BUILD.bazel
index 2a9ca477cf..cb2734b09c 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -105,20 +105,139 @@ container_bundle(
 
 load("@io_bazel_rules_docker//contrib:push-all.bzl", "docker_push")
 
+container_push(
+    name = "push-cdi-func-test-bad-webserver",
+    format = "Docker",
+    image = "//tools/cdi-func-test-bad-webserver:cdi-func-test-bad-webserver-image",
+    registry = "$(container_prefix)",
+    repository = "cdi-func-test-bad-webserver",
+    tag = "$(container_tag)",
+)
+
+container_push(
+    name = "push-cdi-func-test-proxy",
+    format = "Docker",
+    image = "//tools/cdi-func-test-proxy:cdi-func-test-proxy-image",
+    registry = "$(container_prefix)",
+    repository = "cdi-func-test-proxy",
+    tag = "$(container_tag)",
+)
+
+container_push(
+    name = "push-cdi-func-test-sample-populator",
+    format = "Docker",
+    image = "//tools/cdi-func-test-sample-populator:cdi-func-test-sample-populator-image",
+    registry = "$(container_prefix)",
+    repository = "cdi-func-test-sample-populator",
+    tag = "$(container_tag)",
+)
+
+container_push(
+    name = "push-cdi-func-test-file-host-init",
+    format = "Docker",
+    image = "//tools/cdi-func-test-file-host-init:cdi-func-test-file-host-init-image",
+    registry = "$(container_prefix)",
+    repository = "cdi-func-test-file-host-init",
+    tag = "$(container_tag)",
+)
+
+container_push(
+    name = "push-cdi-func-test-file-host-http",
+    format = "Docker",
+    image = "//tools/cdi-func-test-file-host-init:cdi-func-test-file-host-http-image",
+    registry = "$(container_prefix)",
+    repository = "cdi-func-test-file-host-http",
+    tag = "$(container_tag)",
+)
+
+container_push(
+    name = "push-cdi-func-test-registry-init",
+    format = "Docker",
+    image = "//tools/cdi-func-test-registry-init:cdi-func-test-registry-init-image",
+    registry = "$(container_prefix)",
+    repository = "cdi-func-test-registry-init",
+    tag = "$(container_tag)",
+)
+
+container_push(
+    name = "push-cdi-func-test-registry-populate",
+    format = "Docker",
+    image = "//tools/cdi-func-test-registry-init:cdi-func-test-registry-populate-image",
+    registry = "$(container_prefix)",
+    repository = "cdi-func-test-registry-populate",
+    tag = "$(container_tag)",
+)
+
+container_push(
+    name = "push-cdi-func-test-registry",
+    format = "Docker",
+    image = "//tools/cdi-func-test-registry-init:cdi-func-test-registry-image",
+    registry = "$(container_prefix)",
+    repository = "cdi-func-test-registry",
+    tag = "$(container_tag)",
+)
+
+container_push(
+    name = "push-imageio-init",
+    format = "Docker",
+    image = "//tools/imageio-init:imageio-init-image",
+    registry = "$(container_prefix)",
+    repository = "imageio-init",
+    tag = "$(container_tag)",
+)
+
+container_push(
+    name = "push-vcenter-simulator",
+    format = "Docker",
+    image = "//tools/vddk-test:vcenter-simulator",
+    registry = "$(container_prefix)",
+    repository = "vcenter-simulator",
+    tag = "$(container_tag)",
+)
+
+container_push(
+    name = "push-vddk-init",
+    format = "Docker",
+    image = "//tools/vddk-init:vddk-init-image",
+    registry = "$(container_prefix)",
+    repository = "vddk-init",
+    tag = "$(container_tag)",
+)
 
+container_push(
+    name = "push-vddk-test",
+    format = "Docker",
+    image = "//tools/vddk-test:vddk-test-image",
+    registry = "$(container_prefix)",
+    repository = "vddk-test",
+    tag = "$(container_tag)",
+)
 
-alias(
-    name = "test-container-images",
-    actual = select({
-        "@io_bazel_rules_go//go/platform:linux_s390x":":test-container-images-s390x",
-        "@io_bazel_rules_go//go/platform:linux_arm64":":test-container-images-aarch64",
-        "//conditions:default":  ":test-container-images-amd64",
-    })
+container_push(
+    name = "push-cdi-func-test-tinycore",
+    format = "Docker",
+    image = "//tests:cdi-func-test-tinycore",
+    registry = "$(container_prefix)",
+    repository = "cdi-func-test-tinycore",
+    tag = "$(container_tag)",
 )
 
-docker_push(
-    name = "push-test-images",
-    bundle = ":test-container-images",
+container_push(
+    name = "push-cdi-func-test-imageio",
+    format = "Docker",
+    image = "//tools/image-io:cdi-func-test-imageio-image",
+    registry = "$(container_prefix)",
+    repository = "cdi-func-test-imageio",
+    tag = "$(container_tag)",
+)
+
+container_push(
+    name = "push-cdi-func-test-cirros-qcow2",
+    format = "Docker",
+    image = "//tests:cdi-func-test-cirros-qcow2",
+    registry = "$(container_prefix)",
+    repository = "cdi-func-test-cirros-qcow2",
+    tag = "$(container_tag)",
 )
 
 container_push(
diff --git a/hack/build/bazel-build-images.sh b/hack/build/bazel-build-images.sh
index 81a083f275..3d807dd460 100755
--- a/hack/build/bazel-build-images.sh
+++ b/hack/build/bazel-build-images.sh
@@ -31,7 +31,28 @@ for tag in ${docker_tag}; do
         --define container_prefix=${docker_prefix} \
         --define container_tag=${tag} \
         --host_force_python=PY3 \
-        //:test-container-images //cmd/cdi-operator:cdi-operator-image //cmd/cdi-controller:cdi-controller-image //cmd/cdi-apiserver:cdi-apiserver-image //cmd/cdi-cloner:cdi-cloner-image //cmd/cdi-importer:cdi-importer-image //cmd/cdi-uploadproxy:cdi-uploadproxy-image //cmd/cdi-uploadserver:cdi-uploadserver-image
+        //tools/cdi-func-test-bad-webserver:cdi-func-test-bad-webserver-image \
+        //tools/cdi-func-test-proxy:cdi-func-test-proxy-image \
+        //tools/cdi-func-test-sample-populator:cdi-func-test-sample-populator-image \
+        //tools/cdi-func-test-file-host-init:cdi-func-test-file-host-init-image \
+        //tools/cdi-func-test-file-host-init:cdi-func-test-file-host-http-image \
+        //tools/cdi-func-test-registry-init:cdi-func-test-registry-init-image \
+        //tools/cdi-func-test-registry-init:cdi-func-test-registry-populate-image \
+        //tools/cdi-func-test-registry-init:cdi-func-test-registry-image \
+        //tools/imageio-init:imageio-init-image \
+        //tools/vddk-test:vcenter-simulator \
+        //tools/vddk-init:vddk-init-image \
+        //tools/vddk-test:vddk-test-image \
+        //tests:cdi-func-test-tinycore \
+        //tools/image-io:cdi-func-test-imageio-image \
+        //tests:cdi-func-test-cirros-qcow2 \
+        //cmd/cdi-operator:cdi-operator-image \
+        //cmd/cdi-controller:cdi-controller-image \
+        //cmd/cdi-apiserver:cdi-apiserver-image \
+        //cmd/cdi-cloner:cdi-cloner-image \
+        //cmd/cdi-importer:cdi-importer-image \
+        //cmd/cdi-uploadproxy:cdi-uploadproxy-image \
+        //cmd/cdi-uploadserver:cdi-uploadserver-image
 done
 
 rm -rf ${DIGESTS_DIR}/${ARCHITECTURE}
diff --git a/hack/build/bazel-push-images.sh b/hack/build/bazel-push-images.sh
index 29007af08f..d1c190f028 100755
--- a/hack/build/bazel-push-images.sh
+++ b/hack/build/bazel-push-images.sh
@@ -28,6 +28,8 @@ fi
 
 PUSH_TARGETS=(${PUSH_TARGETS:-$CONTROLLER_IMAGE_NAME $IMPORTER_IMAGE_NAME $CLONER_IMAGE_NAME $APISERVER_IMAGE_NAME $UPLOADPROXY_IMAGE_NAME $UPLOADSERVER_IMAGE_NAME $OPERATOR_IMAGE_NAME})
 
+TEST_PUSH_TARGETS=(${TEST_PUSH_TARGETS:-$FUNC_TEST_INIT $FUNC_TEST_HTTP $FUNC_TEST_REGISTRY $FUNC_TEST_REGISTRY_POPULATE $FUNC_TEST_REGISTRY_INIT $FUNC_TEST_BAD_WEBSERVER $FUNC_TEST_PROXY $FUNC_TEST_POPULATOR $FUNC_TEST_IMAGEIO $FUNC_TEST_IMAGEIO_INIT $FUNC_TEST_VCENTER_SIMULATOR $FUNC_TEST_TINYCORE})
+
 echo "docker_prefix: $DOCKER_PREFIX, docker_tag: $DOCKER_TAG"
 for target in ${PUSH_TARGETS[@]}; do
     echo "Pushing: $target"
@@ -40,13 +42,17 @@ for target in ${PUSH_TARGETS[@]}; do
         //:push-${target}
 done
 
-bazel run \
-    --verbose_failures \
-    --config=${ARCHITECTURE} \
-    --define container_prefix=${DOCKER_PREFIX} \
-    --define container_tag=${DOCKER_TAG} \
-    --host_force_python=PY3 \
-    //:push-test-images
+# Push test images
+for target in ${TEST_PUSH_TARGETS[@]}; do
+    echo "Pushing test image: $target"
+    bazel run \
+        --verbose_failures \
+        --config=${ARCHITECTURE} \
+        --define container_prefix=${DOCKER_PREFIX} \
+        --define container_tag=${DOCKER_TAG} \
+        --host_force_python=PY3 \
+        //:push-${target}
+done
 
 rm -rf ${DIGESTS_DIR}/${ARCHITECTURE}
 mkdir -p ${DIGESTS_DIR}/${ARCHITECTURE}
diff --git a/hack/build/config.sh b/hack/build/config.sh
index 561b6fba61..29ad7abd93 100755
--- a/hack/build/config.sh
+++ b/hack/build/config.sh
@@ -27,6 +27,10 @@ FUNC_TEST_REGISTRY_INIT="cdi-func-test-registry-init"
 FUNC_TEST_BAD_WEBSERVER="cdi-func-test-bad-webserver"
 FUNC_TEST_PROXY="cdi-func-test-proxy"
 FUNC_TEST_POPULATOR="cdi-func-test-sample-populator"
+FUNC_TEST_IMAGEIO_INIT="imageio-init"
+FUNC_TEST_IMAGEIO="cdi-func-test-imageio"
+FUNC_TEST_VCENTER_SIMULATOR="vcenter-simulator"
+FUNC_TEST_TINYCORE="cdi-func-test-tinycore"
 
 # update this whenever new builder tag is created
 BUILDER_IMAGE=${BUILDER_IMAGE:-quay.io/kubevirt/kubevirt-cdi-bazel-builder:2503021312-67d1f3d4d}