diff --git a/Dockerfile b/Dockerfile
index 43d152a..bc4c56a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,9 +43,14 @@ LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/
 RUN set -euo pipefail; zypper -n in --no-recommends go1.22 go1.22-doc make curl findutils gawk git-core procps util-linux; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
 ENV GOLANG_VERSION="%%golang_version%%"
 ENV GOPATH="/go"
+ENV GOTOOLCHAIN="local"
 ENV PATH="/go/bin:/usr/local/go/bin:/root/go/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
 
 # only available on go's tsan_arch architectures
 #!ArchExclusiveLine: x86_64 aarch64 s390x ppc64le
-RUN set -euo pipefail; if zypper -n install go1.22-race; then zypper -n clean; rm -rf /var/log/*; fi
+RUN set -euo pipefail; if zypper -n install go1.22-race; then zypper -n clean; fi
+RUN set -euo pipefail; install -m 755 -d /go/bin /go/src
+RUN set -euo pipefail; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+WORKDIR /go
+
diff --git a/golang-stable-image.changes b/golang-stable-image.changes
index f854e65..0d6bec5 100644
--- a/golang-stable-image.changes
+++ b/golang-stable-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul  8 10:31:08 UTC 2024 - Dirk Mueller <dmueller@suse.com>
+
+- more upstream-compatible golang containers
+
 -------------------------------------------------------------------
 Fri Jun 28 06:52:02 UTC 2024 - Dirk Mueller <dmueller@suse.com>