diff --git a/joinservice/cmd/BUILD.bazel b/joinservice/cmd/BUILD.bazel
index a49068fd9..6d09390cc 100644
--- a/joinservice/cmd/BUILD.bazel
+++ b/joinservice/cmd/BUILD.bazel
@@ -57,10 +57,8 @@ pkg_tar(
 
 oci_image(
     name = "joinservice",
-    architecture = "amd64",
-    base = "@distroless_static",
+    base = "@distroless_static_linux_amd64",
     entrypoint = ["/joinservice"],
-    os = "linux",
     tars = [
         ":layer",
     ],
diff --git a/keyservice/cmd/BUILD.bazel b/keyservice/cmd/BUILD.bazel
index 6ef11d958..fdca4a724 100644
--- a/keyservice/cmd/BUILD.bazel
+++ b/keyservice/cmd/BUILD.bazel
@@ -46,10 +46,8 @@ pkg_tar(
 
 oci_image(
     name = "keyservice",
-    architecture = "amd64",
-    base = "@distroless_static",
+    base = "@distroless_static_linux_amd64",
     entrypoint = ["/keyservice"],
-    os = "linux",
     tars = [
         ":layer",
     ],
diff --git a/operators/constellation-node-operator/BUILD.bazel b/operators/constellation-node-operator/BUILD.bazel
index cabfdb200..5da4f0165 100644
--- a/operators/constellation-node-operator/BUILD.bazel
+++ b/operators/constellation-node-operator/BUILD.bazel
@@ -58,10 +58,8 @@ pkg_tar(
 
 oci_image(
     name = "node_operator",
-    architecture = "amd64",
-    base = "@distroless_static",
+    base = "@distroless_static_linux_amd64",
     entrypoint = ["/node-operator"],
-    os = "linux",
     tars = [
         ":layer",
     ],
diff --git a/verify/cmd/BUILD.bazel b/verify/cmd/BUILD.bazel
index 062084ffc..fe9d856c2 100644
--- a/verify/cmd/BUILD.bazel
+++ b/verify/cmd/BUILD.bazel
@@ -43,10 +43,8 @@ pkg_tar(
 
 oci_image(
     name = "verificationservice",
-    architecture = "amd64",
-    base = "@distroless_static",
+    base = "@distroless_static_linux_amd64",
     entrypoint = ["/verify"],
-    os = "linux",
     tars = [
         ":layer",
     ],