diff --git a/.golang.checksum b/.golang.checksum
index 9c084bb7918a70fd655d587a20724ccb132be396..b0d7c8955c5a22d310cf2f462b1ab6c062b55636 100644
--- a/.golang.checksum
+++ b/.golang.checksum
@@ -1 +1 @@
-8eb869c6d88214dc6ac8de76115f9dc354b1957cc6221551047ede0aa14ec9a4
+57d95cedff18711ad139164580785b3ec7e68043e6cecbcb9f8b67aa87a97322
diff --git a/.golang.metadata b/.golang.metadata
index 37372bac28c166ef4b279e25a827c594144a0617..639478ca3e5766ad9eceaea12d87bef109645b67 100644
--- a/.golang.metadata
+++ b/.golang.metadata
@@ -1,2 +1,2 @@
-75d846d58166e7c3318038222e1ebe8e60e6e7498a9d61feb2bc40f2086e7fd0  SOURCES/go1.21.3-1-openssl-fips.tar.gz
-ef050538144510993878a24240d07cb7cc1da411784de1e0c36d16dffcf80aac  SOURCES/go1.21.3.tar.gz
+50ba4523947a6435cb4ce6896a9e5ebdf150282cd81a27f71fa6bdf478ce93c1  SOURCES/go1.21.7-1-openssl-fips.tar.gz
+7f91837da624a43d9cdaf869513c2fbc3478775d72695f513f612c75288d9f45  SOURCES/go1.21.7.tar.gz
diff --git a/SOURCES/modify_go.env.patch b/SOURCES/modify_go.env.patch
new file mode 100644
index 0000000000000000000000000000000000000000..398f5c0c990e1d6cf448090e69ce5f40e576d1d7
--- /dev/null
+++ b/SOURCES/modify_go.env.patch
@@ -0,0 +1,22 @@
+From eab9004c072200e58df83ab94678bda1faa7b229 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= <asm@redhat.com>
+Date: Fri, 9 Feb 2024 20:06:16 +0100
+Subject: [PATCH] Set GOTOOLCHAIN to local
+
+---
+ go.env | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/go.env b/go.env
+index 6ff2b921d4..e87f6e7b6d 100644
+--- a/go.env
++++ b/go.env
+@@ -9,4 +9,4 @@ GOSUMDB=sum.golang.org
+ 
+ # Automatically download newer toolchains as directed by go.mod files.
+ # See https://go.dev/doc/toolchain for details.
+-GOTOOLCHAIN=auto
++GOTOOLCHAIN=local
+-- 
+2.43.0
+
diff --git a/SOURCES/skip-test-overlong-message.patch b/SOURCES/skip-test-overlong-message.patch
new file mode 100644
index 0000000000000000000000000000000000000000..1e143935a95f552d284085fe71609d9690bfa733
--- /dev/null
+++ b/SOURCES/skip-test-overlong-message.patch
@@ -0,0 +1,15 @@
+diff --git a/src/crypto/rsa/pkcs1v15_test.go b/src/crypto/rsa/pkcs1v15_test.go
+index 0853178e3a..16eb37734b 100644
+--- a/src/crypto/rsa/pkcs1v15_test.go
++++ b/src/crypto/rsa/pkcs1v15_test.go
+@@ -247,6 +247,10 @@ func TestVerifyPKCS1v15(t *testing.T) {
+ }
+ 
+ func TestOverlongMessagePKCS1v15(t *testing.T) {
++	// OpenSSL now returns a random string instead of an error
++	if boring.Enabled() {
++		t.Skip("Not relevant in boring mode")
++	}
+ 	ciphertext := decodeBase64("fjOVdirUzFoLlukv80dBllMLjXythIf22feqPrNo0YoIjzyzyoMFiLjAc/Y4krkeZ11XFThIrEvw\nkRiZcCq5ng==")
+ 	_, err := DecryptPKCS1v15(nil, rsaPrivateKey, ciphertext)
+ 	if err == nil {
diff --git a/SPECS/golang.spec b/SPECS/golang.spec
index eab5a91ed3b14778224f99733fdd18210d002deb..c70dcf3b8396d60b2200d2023cbd9528f44eb5a5 100644
--- a/SPECS/golang.spec
+++ b/SPECS/golang.spec
@@ -92,12 +92,12 @@
 %endif
 
 %global go_api 1.21
-%global version 1.21.3
+%global version 1.21.7
 %global pkg_release 1
 
 Name:           golang
 Version:        %{version}
-Release:        4%{?dist}
+Release:        1%{?dist}
 
 Summary:        The Go Programming Language
 # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
@@ -142,8 +142,10 @@ Patch221:       fix_TestScript_list_std.patch
 
 Patch1939923:   skip_test_rhbz1939923.patch
 
-Patch2:        disable_static_tests_part1.patch
-Patch3:        disable_static_tests_part2.patch
+Patch2:		disable_static_tests_part1.patch
+Patch3:		disable_static_tests_part2.patch
+Patch4:		skip-test-overlong-message.patch
+Patch5:		modify_go.env.patch
 
 # Having documentation separate was broken
 Obsoletes:      %{name}-docs < 1.1-4
@@ -250,12 +252,9 @@ ln -s ../go-go%{version} go
 ./scripts/configure-crypto-tests.sh
 popd
 
-%patch2 -p1
-%patch3 -p1
+%autopatch -p1
 
-%patch221 -p1
-
-%patch1939923 -p1
+sed -i '1s/$/ (%{?rhel:Red Hat} %{version}-%{release})/' VERSION
 
 cp %{SOURCE2} ./src/runtime/
 
@@ -518,6 +517,15 @@ cd ..
 %endif
 
 %changelog
+* Tue Feb 13 2024 Alejandro Sáez <asm@redhat.com> - 1.21.7-1
+- Rebase to Go 1.21.7
+- Add release information
+- Set GOTOOLCHAIN to local
+- Skip TestOverlongMessagePKCS1v15
+- Resolves: RHEL-24082
+- Resolves: RHEL-18363
+- Resolves: RHEL-18382
+
 * Wed Nov 08 2023 David Benoit <dbenoit@redhat.com> - 1.21.3-4
 - Do not remove GOPROXY/GOSUMDB
 - Related: RHEL-12620