diff --git a/.gitignore b/.gitignore
index 0337066..cdb5871 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/go1.21.9-1-openssl-fips.tar.gz
-SOURCES/go1.21.9.tar.gz
+SOURCES/go1.21.10-1-openssl-fips.tar.gz
+SOURCES/go1.21.10.tar.gz
diff --git a/.golang.metadata b/.golang.metadata
index 46a4cf1..8dbfdd1 100644
--- a/.golang.metadata
+++ b/.golang.metadata
@@ -1,2 +1,2 @@
-1162b641e8b23110eaab7496003585ea6c786158 SOURCES/go1.21.9-1-openssl-fips.tar.gz
-54c038c82c82ebe2ad4ee2d0a3d7c4d39809f59a SOURCES/go1.21.9.tar.gz
+5994955bf76d241630763bac2adf13659aeb074b SOURCES/go1.21.10-1-openssl-fips.tar.gz
+3e96ad391c41318d39477fbf9430b688dce437b0 SOURCES/go1.21.10.tar.gz
diff --git a/SPECS/golang.spec b/SPECS/golang.spec
index ce1c2fb..4ecfd0e 100644
--- a/SPECS/golang.spec
+++ b/SPECS/golang.spec
@@ -93,13 +93,13 @@
 %endif
 
 %global go_api 1.21
-%global go_version 1.21.9
+%global go_version 1.21.10
 %global version %{go_version}
 %global pkg_release 1
 
 Name:           golang
 Version:        %{version}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        The Go Programming Language
 # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
 License:        BSD and Public Domain
@@ -255,9 +255,13 @@ This is the main package for go-toolset.
 pushd ..
 tar -xf %{SOURCE1}
 popd
-patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/000-initial-setup.patch
-patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/001-initial-openssl-for-fips.patch
-patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/002-strict-fips-runtime-detection.patch
+
+patch_dir="../go-go%{version}-%{pkg_release}-openssl-fips/patches"
+# Add --no-backup-if-mismatch option to avoid creating .orig temp files
+for p in "$patch_dir"/*.patch; do
+       echo "Applying $p"
+      patch -p1 --no-backup-if-mismatch < $p
+done
 
 # Configure crypto tests
 pushd ../go-go%{version}-%{pkg_release}-openssl-fips
@@ -530,6 +534,11 @@ cd ..
 %files -n go-toolset
 
 %changelog
+* Thu May 23 2024 David Benoit <dbenoit@redhat.com> - 1.21.10-1
+- Update to Go 1.21.10
+- Resolves: RHEL-36988
+- Resolves: RHEL-35630
+
 * Mon Apr 15 2024 David Benoit <dbenoit@redhat.com> - 1.21.9-2
 - Rebuilt for z-stream
 - Related: RHEL-24312