diff --git a/Dockerfile b/Dockerfile
index b080e55..dbaf85d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,8 +16,8 @@
 
 #!BuildTag: opensuse/bci/golang:oldstable
 #!BuildTag: opensuse/bci/golang:oldstable-2.%RELEASE%
-#!BuildTag: opensuse/bci/golang:1.20
-#!BuildTag: opensuse/bci/golang:1.20-2.%RELEASE%
+#!BuildTag: opensuse/bci/golang:1.21
+#!BuildTag: opensuse/bci/golang:1.21-2.%RELEASE%
 
 FROM opensuse/tumbleweed:latest
 
@@ -25,22 +25,22 @@ MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.golang
-LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Go 1.20 development"
-LABEL org.opencontainers.image.description="Go 1.20 development container based on the openSUSE Tumbleweed Base Container Image."
-LABEL org.opencontainers.image.version="1.20"
+LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Go 1.21 development"
+LABEL org.opencontainers.image.description="Go 1.21 development container based on the openSUSE Tumbleweed Base Container Image."
+LABEL org.opencontainers.image.version="1.21"
 LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
 LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/golang-oldstable-image/README.md"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/golang:1.20-2.%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/golang:1.21-2.%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime"
 LABEL org.opensuse.release-stage="released"
 
 # endlabelprefix
 
-RUN set -euo pipefail; zypper -n in --no-recommends go1.20 go1.20-doc make git-core; zypper -n clean; rm -rf /var/log/*
+RUN set -euo pipefail; zypper -n in --no-recommends go1.21 go1.21-doc make git-core; zypper -n clean; rm -rf /var/log/*
 ENV GOLANG_VERSION="%%golang_version%%"
 ENV GOPATH="/go"
 ENV PATH="/go/bin:/usr/local/go/bin:/root/go/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
@@ -48,4 +48,4 @@ ENV PATH="/go/bin:/usr/local/go/bin:/root/go/bin/:/usr/local/sbin:/usr/local/bin
 
 # only available on go's tsan_arch architectures
 #!ArchExclusiveLine x86_64 aarch64 s390x ppc64le
-RUN set -euo pipefail; if zypper -n install go1.20-race; then zypper -n clean; rm -rf /var/log/*; fi
+RUN set -euo pipefail; if zypper -n install go1.21-race; then zypper -n clean; rm -rf /var/log/*; fi
diff --git a/README.md b/README.md
index 5f1a3c7..5a41ad3 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
-# The openSUSE Tumbleweed BCI Go 1.20 development Container image
+# The openSUSE Tumbleweed BCI Go 1.21 development Container image
 
-Go 1.20 development container based on the openSUSE Tumbleweed Base Container Image.
+Go 1.21 development container based on the openSUSE Tumbleweed Base Container Image.
diff --git a/_service b/_service
index 160dada..8a16ba7 100644
--- a/_service
+++ b/_service
@@ -4,6 +4,6 @@
   <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="regex">%%golang_version%%</param>
-    <param name="package">go1.20</param>
+    <param name="package">go1.21</param>
   </service>
 </services>
\ No newline at end of file
diff --git a/golang-oldstable-image.changes b/golang-oldstable-image.changes
index b1e9821..16f8026 100644
--- a/golang-oldstable-image.changes
+++ b/golang-oldstable-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb  7 18:41:00 UTC 2024 - Dan Čermák <dcermak@suse.com>
+
+- switch golang stable to 1.22, oldstable to 1.21
+
 -------------------------------------------------------------------
 Wed Jan 17 14:29:14 UTC 2024 - Dan Čermák <dcermak@suse.com>