diff --git a/golang.spec b/golang.spec
index 99d6230..6d910bc 100644
--- a/golang.spec
+++ b/golang.spec
@@ -111,7 +111,7 @@
 %global pkg_release 1
 
 # For rpmdev-bumpspec and releng automation.
-%global baserelease 2
+%global baserelease 3
  
 Name:           golang
 Version:        %{go_version}
@@ -327,20 +327,12 @@ cp %{SOURCE2} ./src/runtime/
     popd
     # TODO Check here, this is failing due to the external linker flag? maybe, but it's clearly related to that according tho this commit:
     # https://github.com/golang-fips/go/blob/main/patches/000-initial-setup.patch#L48
-    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 -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/003-init-openssl-v2-backend.patch
-    patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/004-fixes.patch
-    patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/005-fixes-2.patch
-    patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/006-fixes-3.patch
-    patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/007-fixes-4.patch
-    patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/008-fixes-5.patch
-    patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/009-fixes-6.patch
-    patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/010-fixes-7.patch
-    patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/011-122-fixes.patch
-    patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/012-fixes.patch
-    patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/013-fixes.patch
+    # Add --no-backup-if-mismatch option to avoid creating .orig temp files
+    patch_dir="../go-go%{version}-%{pkg_release}-openssl-fips/patches"
+    for p in "$patch_dir"/*.patch; do
+	echo "Applying $p"
+	patch --no-backup-if-mismatch -p1 < $p
+    done
 
     # Configure crypto tests
     echo "Configure crypto tests"
@@ -349,8 +341,6 @@ cp %{SOURCE2} ./src/runtime/
     ./scripts/configure-crypto-tests.sh
     popd
 %endif
-# Remove all .orig files if they are generated during patching
-find -name "*.orig" -exec rm {} \;
 
 %build
 # -x: print commands as they are executed