diff --git a/.bazelrc b/.bazelrc
index fe449cadc8..6142457e28 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -22,10 +22,9 @@ build:s390x --platforms=@io_bazel_rules_go//go/toolchain:linux_s390x_cgo --incom
 run:s390x --platforms=@io_bazel_rules_go//go/toolchain:linux_s390x_cgo --incompatible_use_cc_configure_from_rules_cc
 test:s390x --platforms=@io_bazel_rules_go//go/toolchain:linux_s390x_cgo --host_javabase=@local_jdk//:jdk
 
-build:crossbuild-s390x --incompatible_enable_cc_toolchain_resolution --platforms=//bazel/platforms:s390x-none-linux-gnu --platforms=@io_bazel_rules_go
-//go/toolchain:linux_s390x_cgo
-run:crossbuild-s390x  --incompatible_enable_cc_toolchain_resolution --platforms=//bazel/platforms:s390x-none-linux-gnu --platforms=@io_bazel_rules_go/
-/go/toolchain:linux_s390x_cgo
+
+build:crossbuild-s390x --incompatible_enable_cc_toolchain_resolution --platforms=//bazel/platforms:s390x-none-linux-gnu --platforms=@io_bazel_rules_go//go/toolchain:linux_s390x_cgo
+run:crossbuild-s390x  --incompatible_enable_cc_toolchain_resolution --platforms=//bazel/platforms:s390x-none-linux-gnu --platforms=@io_bazel_rules_go//go/toolchain:linux_s390x_cgo
 test:crossbuild-s390x --platforms=@io_bazel_rules_go//go/toolchain:linux_s390x_cgo --host_javabase=@local_jdk//:jdk
 
 build --define gotags=selinux
diff --git a/WORKSPACE b/WORKSPACE
index 31c5e5f46d..d9b26354c3 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -182,6 +182,14 @@ container_pull(
     tag = "2.8",
 )
 
+container_pull(
+    name = "registry-s390x",
+    digest = "sha256:7e1926b82e5b862a633b83acf8f456e1619be720aff346e1b634db2f843082b7",
+    registry = "quay.io",
+    repository = "libpod/registry",
+    tag = "2.8",
+)
+
 http_file(
     name = "vcenter-govc-tar",
     downloaded_file_path = "govc.tar.gz",
diff --git a/bazel/toolchain/s390x-none-linux-gnu/BUILD b/bazel/toolchain/s390x-none-linux-gnu/BUILD
new file mode 100644
index 0000000000..c662a51fa0
--- /dev/null
+++ b/bazel/toolchain/s390x-none-linux-gnu/BUILD
@@ -0,0 +1,41 @@
+package(default_visibility = ["//visibility:public"])
+
+load(":cc_toolchain_config.bzl", "cc_toolchain_config")
+
+filegroup(name = "empty")
+
+cc_toolchain_config(name = "s390x_toolchain_config")
+
+cc_toolchain(
+    name = "s390x_toolchain",
+    all_files = ":empty",
+    compiler_files = ":empty",
+    dwp_files = ":empty",
+    linker_files = ":empty",
+    objcopy_files = ":empty",
+    strip_files = ":empty",
+    toolchain_config = ":s390x_toolchain_config",
+    toolchain_identifier = "s390x-toolchain",
+)
+
+cc_toolchain_suite(
+    name = "gcc_toolchain",
+    tags = ["manual"],
+    toolchains = {
+        "s390x": ":s390x_toolchain",
+    },
+)
+
+toolchain(
+    name = "s390x_linux_toolchain",
+    exec_compatible_with = [
+        "@platforms//os:linux",
+        "@platforms//cpu:x86_64",
+    ],
+    target_compatible_with = [
+        "@platforms//os:linux",
+        "@platforms//cpu:s390x",
+    ],
+    toolchain = ":s390x_toolchain",
+    toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
+)
diff --git a/bazel/toolchain/s390x-none-linux-gnu/cc_toolchain_config.bzl b/bazel/toolchain/s390x-none-linux-gnu/cc_toolchain_config.bzl
new file mode 100644
index 0000000000..545872b05a
--- /dev/null
+++ b/bazel/toolchain/s390x-none-linux-gnu/cc_toolchain_config.bzl
@@ -0,0 +1,144 @@
+load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "ACTION_NAMES")
+load(
+    "@bazel_tools//tools/cpp:cc_toolchain_config_lib.bzl",
+    "feature",
+    "flag_group",
+    "flag_set",
+    "tool_path",
+)
+
+all_link_actions = [
+    ACTION_NAMES.cpp_link_executable,
+    ACTION_NAMES.cpp_link_dynamic_library,
+    ACTION_NAMES.cpp_link_nodeps_dynamic_library,
+]
+
+all_compile_actions = [
+    ACTION_NAMES.assemble,
+    ACTION_NAMES.c_compile,
+    ACTION_NAMES.clif_match,
+    ACTION_NAMES.cpp_compile,
+    ACTION_NAMES.cpp_header_parsing,
+    ACTION_NAMES.cpp_module_codegen,
+    ACTION_NAMES.cpp_module_compile,
+    ACTION_NAMES.linkstamp_compile,
+    ACTION_NAMES.lto_backend,
+    ACTION_NAMES.preprocess_assemble,
+]
+
+def _impl(ctx):
+    tool_paths = [
+        tool_path(
+            name = "ar",
+            path = "/usr/bin/s390x-linux-gnu-ar",
+        ),
+        tool_path(
+            name = "cpp",
+            path = "/usr/bin/s390x-linux-gnu-cpp",
+        ),
+        tool_path(
+            name = "gcc",
+            path = "/usr/bin/s390x-linux-gnu-gcc",
+        ),
+        tool_path(
+            name = "gcov",
+            path = "/usr/bin/s390x-linux-gnu-gcov",
+        ),
+        tool_path(
+            name = "ld",
+            path = "/usr/bin/s390x-linux-gnu-ld",
+        ),
+        tool_path(
+            name = "nm",
+            path = "/usr/bin/s390x-linux-gnu-nm",
+        ),
+        tool_path(
+            name = "objdump",
+            path = "/usr/bin/s390x-linux-gnu-objdump",
+        ),
+        tool_path(
+            name = "strip",
+            path = "/usr/bin/s390x-linux-gnu-strip",
+        ),
+    ]
+
+    # Update the value of __TOOLCHAIN_SYSROOT__ every time the list
+    # of cxx_builtin_include_directories has been modified.
+    #
+    # This is needed to make bazel realize that the updated toolchain
+    # is different from the previous one and handle caching correctly.
+    #
+    # https://github.com/kubevirt/kubevirt/pull/8404#issuecomment-1275096374
+    default_compiler_flags = feature(
+        name = "default_compiler_flags",
+        enabled = True,
+        flag_sets = [
+            flag_set(
+                actions = all_compile_actions,
+                flag_groups = [
+                    flag_group(
+                        flags = [
+                            "-no-canonical-prefixes",
+                            "-fno-canonical-system-headers",
+                            "-Wno-builtin-macro-redefined",
+                            "-D__DATE__=\"redacted\"",
+                            "-D__TIMESTAMP__=\"redacted\"",
+                            "-D__TIME__=\"redacted\"",
+                            "-D__TOOLCHAIN_SYSROOT__=\"centos-stream-9\"",
+                            "-nostdinc",
+                            "-I/usr/s390x-linux-gnu/sys-root/usr/include",
+                            "-I/usr/lib/gcc/s390x-linux-gnu/12/include",
+                            "-I/usr/lib/gcc/s390x-linux-gnu/12/include-fixed",
+                        ],
+                    ),
+                ],
+            ),
+        ],
+    )
+
+    default_linker_flags = feature(
+        name = "default_linker_flags",
+        enabled = True,
+        flag_sets = [
+            flag_set(
+                actions = all_link_actions,
+                flag_groups = ([
+                    flag_group(
+                        flags = [
+                            "",
+                        ],
+                    ),
+                ]),
+            ),
+        ],
+    )
+
+    features = [
+        default_compiler_flags,
+        default_linker_flags,
+    ]
+
+    return cc_common.create_cc_toolchain_config_info(
+        ctx = ctx,
+        cxx_builtin_include_directories = [
+            "/usr/s390x-linux-gnu/sys-root/usr/include",
+            "/usr/lib/gcc/s390x-linux-gnu/12/include",
+            "/usr/lib/gcc/s390x-linux-gnu/12/include-fixed",
+        ],
+        features = features,
+        toolchain_identifier = "s390x-toolchain",
+        host_system_name = "local",
+        target_system_name = "unknown",
+        target_cpu = "unknown",
+        target_libc = "unknown",
+        compiler = "unknown",
+        abi_version = "unknown",
+        abi_libc_version = "unknown",
+        tool_paths = tool_paths,
+    )
+
+cc_toolchain_config = rule(
+    implementation = _impl,
+    attrs = {},
+    provides = [CcToolchainConfigInfo],
+)
diff --git a/bazel/toolchain/toolchain.bzl b/bazel/toolchain/toolchain.bzl
index d859d41b5c..205e2ec96d 100644
--- a/bazel/toolchain/toolchain.bzl
+++ b/bazel/toolchain/toolchain.bzl
@@ -1,4 +1,5 @@
 def register_all_toolchains():
     native.register_toolchains(
+        "//bazel/toolchain/s390x-none-linux-gnu:s390x_linux_toolchain",
         "//bazel/toolchain/aarch64-none-linux-gnu:aarch64_linux_toolchain",
     )
diff --git a/cmd/cdi-apiserver/BUILD.bazel b/cmd/cdi-apiserver/BUILD.bazel
index a94a251aa9..b73ab5e388 100644
--- a/cmd/cdi-apiserver/BUILD.bazel
+++ b/cmd/cdi-apiserver/BUILD.bazel
@@ -47,6 +47,7 @@ load(
 container_image(
     name = "cdi-apiserver-image",
     architecture = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": "s390x",
         "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
diff --git a/cmd/cdi-cloner/BUILD.bazel b/cmd/cdi-cloner/BUILD.bazel
index 5a0d142186..dfedf3eb3b 100644
--- a/cmd/cdi-cloner/BUILD.bazel
+++ b/cmd/cdi-cloner/BUILD.bazel
@@ -40,6 +40,7 @@ go_test(
 container_image(
     name = "cdi-cloner-image",
     architecture = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": "s390x",
         "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
diff --git a/cmd/cdi-controller/BUILD.bazel b/cmd/cdi-controller/BUILD.bazel
index 8d4e10d7c4..216a5a266d 100644
--- a/cmd/cdi-controller/BUILD.bazel
+++ b/cmd/cdi-controller/BUILD.bazel
@@ -61,6 +61,7 @@ load(
 container_image(
     name = "cdi-controller-image",
     architecture = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": "s390x",
         "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
diff --git a/cmd/cdi-importer/BUILD.bazel b/cmd/cdi-importer/BUILD.bazel
index 1567c3817f..dbac77ded0 100644
--- a/cmd/cdi-importer/BUILD.bazel
+++ b/cmd/cdi-importer/BUILD.bazel
@@ -34,6 +34,7 @@ load(
 container_image(
     name = "cdi-importer-image",
     architecture = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": "s390x",
         "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
@@ -58,6 +59,10 @@ container_image(
 container_image(
     name = "importer_base",
     tars = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": [
+            "//rpm:cdi_importer_base_s390x",
+            "//:ca_anchors_tar",
+        ],
         "@io_bazel_rules_go//go/platform:linux_arm64": [
             "//rpm:cdi_importer_base_aarch64",
             "//:ca_anchors_tar",
diff --git a/cmd/cdi-operator/BUILD.bazel b/cmd/cdi-operator/BUILD.bazel
index bd2fb86964..8bb3790229 100644
--- a/cmd/cdi-operator/BUILD.bazel
+++ b/cmd/cdi-operator/BUILD.bazel
@@ -39,6 +39,7 @@ load(
 container_image(
     name = "cdi-operator-image",
     architecture = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": "s390x",
         "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
diff --git a/cmd/cdi-uploadproxy/BUILD.bazel b/cmd/cdi-uploadproxy/BUILD.bazel
index 859dcc5b80..7aca678e88 100644
--- a/cmd/cdi-uploadproxy/BUILD.bazel
+++ b/cmd/cdi-uploadproxy/BUILD.bazel
@@ -35,6 +35,7 @@ load(
 container_image(
     name = "cdi-uploadproxy-image",
     architecture = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": "s390x",
         "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
diff --git a/cmd/cdi-uploadserver/BUILD.bazel b/cmd/cdi-uploadserver/BUILD.bazel
index 016bbb7d48..4e21912b47 100755
--- a/cmd/cdi-uploadserver/BUILD.bazel
+++ b/cmd/cdi-uploadserver/BUILD.bazel
@@ -30,6 +30,7 @@ load(
 container_image(
     name = "cdi-uploadserver-image",
     architecture = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": "s390x",
         "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
@@ -47,6 +48,9 @@ container_image(
 container_image(
     name = "uploadserver_base",
     tars = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": [
+            "//rpm:cdi_uploadserver_base_s390x",
+        ],
         "@io_bazel_rules_go//go/platform:linux_arm64": [
             "//rpm:cdi_uploadserver_base_aarch64",
         ],
diff --git a/hack/build/rpm-deps.sh b/hack/build/rpm-deps.sh
index 7c8ae357d5..72350812e2 100755
--- a/hack/build/rpm-deps.sh
+++ b/hack/build/rpm-deps.sh
@@ -234,3 +234,4 @@ bazel run \
 bazel run \
     --config=s390x \
     //:bazeldnf -- prune
+
diff --git a/hack/build/run-linters.sh b/hack/build/run-linters.sh
index 8ae160e57c..847c91a6e4 100755
--- a/hack/build/run-linters.sh
+++ b/hack/build/run-linters.sh
@@ -6,5 +6,5 @@ MONITORING_LINTER_VERSION="${MONITORING_LINTER_VERSION:-e2be790}"
 go install "github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_VERSION}"
 go install "github.com/kubevirt/monitoring/monitoringlinter/cmd/monitoringlinter@${MONITORING_LINTER_VERSION}"
 
-golangci-lint run ./... "$@"
+golangci-lint  run ./... "$@"
 monitoringlinter ./...
diff --git a/pkg/importer/BUILD.bazel b/pkg/importer/BUILD.bazel
index f8f3ce3e0b..dfbe3e9b2f 100644
--- a/pkg/importer/BUILD.bazel
+++ b/pkg/importer/BUILD.bazel
@@ -16,6 +16,7 @@ go_library(
         "util.go",
         "vddk-datasource_amd64.go",
         "vddk-datasource_arm64.go",
+        "vddk-datasource_s390x.go",
     ],
     importpath = "kubevirt.io/containerized-data-importer/pkg/importer",
     visibility = ["//visibility:public"],
@@ -62,6 +63,9 @@ go_library(
         "@io_bazel_rules_go//go/platform:arm64": [
             "//vendor/k8s.io/api/core/v1:go_default_library",
         ],
+        "@io_bazel_rules_go//go/platform:s390x": [
+            "//vendor/k8s.io/api/core/v1:go_default_library",
+        ],
         "//conditions:default": [],
     }),
 )
diff --git a/pkg/importer/vddk-datasource_s390x.go b/pkg/importer/vddk-datasource_s390x.go
new file mode 100644
index 0000000000..1e933107c2
--- /dev/null
+++ b/pkg/importer/vddk-datasource_s390x.go
@@ -0,0 +1,52 @@
+//go:build s390x
+// +build s390x
+
+package importer
+
+import (
+	"errors"
+	"net/url"
+
+	v1 "k8s.io/api/core/v1"
+
+
+	"kubevirt.io/containerized-data-importer/pkg/common"
+)
+
+// VDDKDataSource is the data provider for vddk.
+type VDDKDataSource struct {
+}
+
+func (V VDDKDataSource) Info() (ProcessingPhase, error) {
+	panic("not support")
+}
+
+func (V VDDKDataSource) Transfer(path string) (ProcessingPhase, error) {
+	panic("not support")
+}
+
+func (V VDDKDataSource) TransferFile(fileName string) (ProcessingPhase, error) {
+	panic("not support")
+}
+
+func (V VDDKDataSource) GetURL() *url.URL {
+	panic("not support")
+}
+
+func (V VDDKDataSource) GetTerminationMessage() *common.TerminationMessage {
+	panic("not support")
+}
+
+func (V VDDKDataSource) Close() error {
+	panic("not support")
+}
+
+func (V VDDKDataSource) IsDeltaCopy() bool {
+	return false
+}
+
+func NewVDDKDataSource(endpoint string, accessKey string, secKey string, thumbprint string, uuid string, backingFile string, currentCheckpoint string, previousCheckpoint string, finalCheckpoint string, volumeMode v1.PersistentVolumeMode) (*VDDKDataSource, error) {
+	return nil, errors.New("the s390x architecture does not support VDDK")
+}
+
+var _ DataSourceInterface = &VDDKDataSource{}
diff --git a/tools/cdi-func-test-bad-webserver/BUILD.bazel b/tools/cdi-func-test-bad-webserver/BUILD.bazel
index 107ed0d704..81f9afcd28 100644
--- a/tools/cdi-func-test-bad-webserver/BUILD.bazel
+++ b/tools/cdi-func-test-bad-webserver/BUILD.bazel
@@ -5,10 +5,14 @@ load("@io_bazel_rules_docker//container:container.bzl", "container_image")
 container_image(
     name = "cdi-func-test-bad-webserver-image-base",
     architecture = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": "s390x",
         "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     tars = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": [
+            "//rpm:testimage_s390x",
+        ],
         "@io_bazel_rules_go//go/platform:linux_arm64": [
             "//rpm:testimage_aarch64",
         ],
diff --git a/tools/cdi-func-test-file-host-init/BUILD.bazel b/tools/cdi-func-test-file-host-init/BUILD.bazel
index e75637ef04..94dd206f21 100644
--- a/tools/cdi-func-test-file-host-init/BUILD.bazel
+++ b/tools/cdi-func-test-file-host-init/BUILD.bazel
@@ -24,11 +24,17 @@ go_binary(
 container_image(
     name = "cdi-func-test-file-host-init-file-image",
     architecture = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": "s390x",
         "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     directory = "/",
     tars = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": [
+            ":test-img-tar",
+            ":test-invalid-img-tar",
+            "//rpm:testimage_s390x",
+        ],
         "@io_bazel_rules_go//go/platform:linux_arm64": [
             ":test-img-tar",
             ":test-invalid-img-tar",
@@ -46,6 +52,7 @@ container_image(
 container_image(
     name = "cdi-func-test-file-host-init-image",
     architecture = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": "s390x",
         "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
@@ -62,6 +69,7 @@ container_image(
 container_image(
     name = "cdi-func-test-file-host-http-image",
     architecture = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": "s390x",
         "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
@@ -82,6 +90,10 @@ container_image(
         "444",
     ],
     tars = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": [
+            ":nginx-conf-tar",
+            "//rpm:testimage_aarch64",
+        ],
         "@io_bazel_rules_go//go/platform:linux_arm64": [
             ":nginx-conf-tar",
             "//rpm:testimage_aarch64",
diff --git a/tools/cdi-func-test-proxy/BUILD.bazel b/tools/cdi-func-test-proxy/BUILD.bazel
index 91ad267780..ee026a10c0 100644
--- a/tools/cdi-func-test-proxy/BUILD.bazel
+++ b/tools/cdi-func-test-proxy/BUILD.bazel
@@ -5,10 +5,14 @@ load("@io_bazel_rules_docker//container:container.bzl", "container_image")
 container_image(
     name = "cdi-func-test-proxy-image-base",
     architecture = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": "s390x",
         "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     tars = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": [
+            "//rpm:testimage_s390x",
+        ],
         "@io_bazel_rules_go//go/platform:linux_arm64": [
             "//rpm:testimage_aarch64",
         ],
diff --git a/tools/cdi-func-test-registry-init/BUILD.bazel b/tools/cdi-func-test-registry-init/BUILD.bazel
index 6413969b8b..1f94f86a7c 100644
--- a/tools/cdi-func-test-registry-init/BUILD.bazel
+++ b/tools/cdi-func-test-registry-init/BUILD.bazel
@@ -25,11 +25,16 @@ go_binary(
 container_image(
     name = "cdi-func-test-registry-init-file-image",
     architecture = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": "s390x",
         "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     directory = "/",
     tars = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": [
+            ":test-img-tar",
+            "//rpm:testimage_s390x",
+        ],
         "@io_bazel_rules_go//go/platform:linux_arm64": [
             ":test-img-tar",
             "//rpm:testimage_aarch64",
@@ -44,6 +49,7 @@ container_image(
 container_image(
     name = "cdi-func-test-registry-exec-init-image",
     architecture = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": "s390x",
         "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
@@ -56,6 +62,7 @@ container_image(
 container_image(
     name = "cdi-func-test-registry-init-image",
     architecture = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": "s390x",
         "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
@@ -78,12 +85,17 @@ pkg_tar(
 container_image(
     name = "cdi-func-test-registry-populate-image",
     architecture = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": "s390x",
         "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     directory = "/",
     entrypoint = ["./populate-registry.sh"],
     tars = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": [
+            ":populate-script-tar",
+            "//rpm:testimage_s390x",
+        ],
         "@io_bazel_rules_go//go/platform:linux_arm64": [
             ":populate-script-tar",
             "//rpm:testimage_aarch64",
@@ -114,10 +126,12 @@ pkg_tar(
 container_image(
     name = "cdi-func-test-registry-image",
     architecture = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": "s390x",
         "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     base = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": "@registry-s390x//image",
         "@io_bazel_rules_go//go/platform:linux_arm64": "@registry-aarch64//image",
         "//conditions:default": "@registry//image",
     }),
diff --git a/tools/cdi-func-test-sample-populator/BUILD.bazel b/tools/cdi-func-test-sample-populator/BUILD.bazel
index 1715bfc00d..958028f8da 100644
--- a/tools/cdi-func-test-sample-populator/BUILD.bazel
+++ b/tools/cdi-func-test-sample-populator/BUILD.bazel
@@ -5,10 +5,14 @@ load("@io_bazel_rules_docker//container:container.bzl", "container_image")
 container_image(
     name = "cdi-func-test-sample-populator-image-base",
     architecture = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": "s390x",
         "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     tars = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": [
+            "//rpm:testimage_s390x",
+        ],
         "@io_bazel_rules_go//go/platform:linux_arm64": [
             "//rpm:testimage_aarch64",
         ],
diff --git a/tools/vddk-init/BUILD.bazel b/tools/vddk-init/BUILD.bazel
index c299b735c2..cc72ecb642 100644
--- a/tools/vddk-init/BUILD.bazel
+++ b/tools/vddk-init/BUILD.bazel
@@ -8,6 +8,9 @@ container_image(
         "vmware-vix-disklib-distrib",
     ],
     tars = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": [
+            "//rpm:testimage_s390x",
+        ],
         "@io_bazel_rules_go//go/platform:linux_arm64": [
             "//rpm:testimage_aarch64",
         ],
diff --git a/tools/vddk-test/BUILD.bazel b/tools/vddk-test/BUILD.bazel
index 8a7f9c7c77..ec97a9f769 100644
--- a/tools/vddk-test/BUILD.bazel
+++ b/tools/vddk-test/BUILD.bazel
@@ -22,6 +22,9 @@ container_image(
         "//tests:images/cirros.raw",
     ],
     tars = select({
+        "@io_bazel_rules_go//go/platform:linux_s390x": [
+            "//rpm:testimage_s390x",
+        ],
         "@io_bazel_rules_go//go/platform:linux_arm64": [
             "//rpm:testimage_aarch64",
         ],