diff --git a/src/go-build-wrapper b/src/go-build-wrapper
index a5a1a6a50..48530f27d 100755
--- a/src/go-build-wrapper
+++ b/src/go-build-wrapper
@@ -116,7 +116,7 @@ dynamic_linker="/run/host$dynamic_linker_canonical_dirname/$dynamic_linker_basen
 go build \
         $tags \
         -trimpath \
-        -ldflags "-extldflags '-Wl,-dynamic-linker,$dynamic_linker -Wl,-rpath,/run/host$libc_dir_canonical_dirname -Wl,--export-dynamic -Wl,--unresolved-symbols=ignore-in-object-files' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$4" \
+        -ldflags "-extldflags '-Wl,-z,lazy,-dynamic-linker,$dynamic_linker,-rpath,/run/host$libc_dir_canonical_dirname,--export-dynamic,--unresolved-symbols=ignore-in-object-files' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$4" \
         -o "$2/$3"
 
 exit "$?"
diff --git a/src/meson_generate_completions.py b/src/meson_generate_completions.py
index 6df8c7107..941ee3fb2 100644
--- a/src/meson_generate_completions.py
+++ b/src/meson_generate_completions.py
@@ -29,6 +29,6 @@
 completion_type = sys.argv[2]
 
 os.chdir(source_dir)
-output = subprocess.run(['go', 'run', '.', 'completion', completion_type], check=True)
+output = subprocess.run(['go', 'run', '-ldflags=-extldflags=-Wl,-z,lazy' '.', 'completion', completion_type], check=True)
 
 sys.exit(0)