diff --git a/lang/go.bzl b/lang/go.bzl
index 7592aa40..73790c82 100644
--- a/lang/go.bzl
+++ b/lang/go.bzl
@@ -10,6 +10,7 @@ def go_image(
         goos = "linux",
         gotags = ["containers_image_openpgp"],
         pure = "on",
+        package_dir = "",
         base = "@go_image_static",
         visibility = ["//visibility:public"]):
     """Emulate syntax of rules_gitops go_image."""
@@ -25,12 +26,15 @@ def go_image(
     pkg_tar(
         name = name + "_tar",
         srcs = [":" + name + "_binary"],
+        include_runfiles = True,
         visibility = visibility,
+        package_dir = package_dir,
+        strip_prefix = ".",
     )
     oci_image(
         name = name,
         base = base,
-        entrypoint = ["/" + name + "_binary"],
+        entrypoint = ["/" + package_dir + name + "_binary_/" + name + "_binary"],
         tars = [":" + name + "_tar"] + tars,
         visibility = visibility,
     )