diff --git a/0001-Modify-go.env.patch b/0001-Modify-go.env.patch
index 02fdbd0..7eb355b 100644
--- a/0001-Modify-go.env.patch
+++ b/0001-Modify-go.env.patch
@@ -1,32 +1,30 @@
-From f02acf07aabbe16a7c312915e17f9d17cfc475cf Mon Sep 17 00:00:00 2001
-From: Archana Ravindar <aravinda@redhat.com>
-Date: Mon, 25 Mar 2024 22:18:07 +0530
-Subject: [PATCH] set v3 as default ISA for AMD64 in go.env patch file
+From d6e201910aa29262851c9274a4cd3645022d3539 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= <asm@redhat.com>
+Date: Tue, 9 Apr 2024 10:05:46 +0200
+Subject: [PATCH] Modify environment variables defaults
 
+- Set GOTOOLCHAIN to local
+- Set GOAMD64 to v3
+- Set GOPPC64 to power9
 ---
- go.env | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
+ go.env | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/go.env b/go.env
-index 6ff2b921d4..17d4053cdc 100644
+index 6ff2b921d4..aadcda023b 100644
 --- a/go.env
 +++ b/go.env
-@@ -4,9 +4,12 @@
- 
- # Use the Go module mirror and checksum database by default.
- # See https://proxy.golang.org for details.
--GOPROXY=https://proxy.golang.org,direct
--GOSUMDB=sum.golang.org
-+GOPROXY=direct
-+GOSUMDB=off
+@@ -9,4 +9,7 @@ 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
 +
-+# Set baseline amd64 ISA to v3 as distribution default
++# The AMD64 baseline for RHEL10 is v3.
 +GOAMD64=v3
++# The PPC64LE baseline for RHEL10 is power9
++GOPPC64=power9
 -- 
 2.44.0
 
diff --git a/0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch b/0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch
deleted file mode 100644
index fba9713..0000000
--- a/0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From fa250374b727439159bc9f203b854bb5df00186f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
-Date: Mon, 27 May 2019 15:12:53 +0200
-Subject: [PATCH 3/3] cmd/go: disable Google's proxy and sumdb
-
----
- src/cmd/go/internal/cfg/cfg.go                  | 4 ++--
- src/cmd/go/testdata/script/mod_sumdb_golang.txt | 6 +++---
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go
-index 57a3c1ff6f..e56c60e591 100644
---- a/src/cmd/go/internal/cfg/cfg.go
-+++ b/src/cmd/go/internal/cfg/cfg.go
-@@ -266,8 +266,8 @@ var (
- 	GOPPC64  = envOr("GOPPC64", fmt.Sprintf("%s%d", "power", buildcfg.GOPPC64))
- 	GOWASM   = envOr("GOWASM", fmt.Sprint(buildcfg.GOWASM))
- 
--	GOPROXY    = envOr("GOPROXY", "https://proxy.golang.org,direct")
--	GOSUMDB    = envOr("GOSUMDB", "sum.golang.org")
-+	GOPROXY    = envOr("GOPROXY", "direct")
-+	GOSUMDB    = envOr("GOSUMDB", "off")
- 	GOPRIVATE  = Getenv("GOPRIVATE")
- 	GONOPROXY  = envOr("GONOPROXY", GOPRIVATE)
- 	GONOSUMDB  = envOr("GONOSUMDB", GOPRIVATE)
-diff --git a/src/cmd/go/testdata/script/mod_sumdb_golang.txt b/src/cmd/go/testdata/script/mod_sumdb_golang.txt
-index becd88b52e..b2a1250372 100644
---- a/src/cmd/go/testdata/script/mod_sumdb_golang.txt
-+++ b/src/cmd/go/testdata/script/mod_sumdb_golang.txt
-@@ -2,12 +2,12 @@
- env GOPROXY=
- env GOSUMDB=
- go env GOPROXY
--stdout '^https://proxy.golang.org,direct$'
-+stdout '^direct$'
- go env GOSUMDB
--stdout '^sum.golang.org$'
-+stdout '^off$'
- env GOPROXY=https://proxy.golang.org
- go env GOSUMDB
--stdout '^sum.golang.org$'
-+stdout '^off$'
- 
- # Download direct from github.
- 
--- 
-2.31.1
-
diff --git a/modify_go.env.patch b/modify_go.env.patch
deleted file mode 100644
index 7eb355b..0000000
--- a/modify_go.env.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d6e201910aa29262851c9274a4cd3645022d3539 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= <asm@redhat.com>
-Date: Tue, 9 Apr 2024 10:05:46 +0200
-Subject: [PATCH] Modify environment variables defaults
-
-- Set GOTOOLCHAIN to local
-- Set GOAMD64 to v3
-- Set GOPPC64 to power9
----
- go.env | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/go.env b/go.env
-index 6ff2b921d4..aadcda023b 100644
---- a/go.env
-+++ b/go.env
-@@ -9,4 +9,7 @@ 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
-+
-+# The AMD64 baseline for RHEL10 is v3.
-+GOAMD64=v3
-+# The PPC64LE baseline for RHEL10 is power9
-+GOPPC64=power9
--- 
-2.44.0
-