diff --git a/Dockerfile b/Dockerfile
index 032567f..747f25e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: MIT
 #!BuildTag: opensuse/bci/golang:stable
 #!BuildTag: opensuse/bci/golang:stable-1.%RELEASE%
-#!BuildTag: opensuse/bci/golang:1.20
-#!BuildTag: opensuse/bci/golang:1.20-1.%RELEASE%
+#!BuildTag: opensuse/bci/golang:1.21
+#!BuildTag: opensuse/bci/golang:1.21-1.%RELEASE%
 #!BuildTag: opensuse/bci/golang:latest
 
 FROM opensuse/tumbleweed:latest
@@ -11,21 +11,21 @@ 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 Golang 1.20"
-LABEL org.opencontainers.image.description="Golang 1.20 container based on the openSUSE Tumbleweed Base Container Image."
-LABEL org.opencontainers.image.version="1.20"
+LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Golang 1.21"
+LABEL org.opencontainers.image.description="Golang 1.21 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 org.opensuse.reference="registry.opensuse.org/opensuse/bci/golang:1.20-1.%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/golang:1.21-1.%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 go1.20-race make git-core; zypper -n clean; rm -rf /var/log/*
+RUN set -euo pipefail; zypper -n in --no-recommends go1.21 go1.21-doc go1.21-race 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"
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-stable-image.changes b/golang-stable-image.changes
index c7ddad6..26a5d56 100644
--- a/golang-stable-image.changes
+++ b/golang-stable-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 17 13:41:09 UTC 2023 - Dirk Mueller <dmueller@suse.com>
+
+- go 1.21 is now stable, go 1.20 is now oldstable
+
 -------------------------------------------------------------------
 Tue Aug  8 06:51:38 UTC 2023 - Dirk Mueller <dmueller@suse.com>