diff --git a/.gitignore b/.gitignore
index bd37c2e..fbef7d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@ SOURCES/go1.19.4.tar.gz
 /go1.21.7-1-openssl-fips.tar.gz
 /go1.22.2.tar.gz
 /go1.22.2-1-openssl-fips.tar.gz
+/go1.22.3-1-openssl-fips.tar.gz
+/go1.22.3.tar.gz
diff --git a/golang.spec b/golang.spec
index 7b30344..928db24 100644
--- a/golang.spec
+++ b/golang.spec
@@ -92,7 +92,7 @@
 %endif
 
 %global go_api 1.22
-%global version 1.22.2
+%global version 1.22.3
 %global pkg_release 1
 
 Name:           golang
@@ -145,7 +145,6 @@ Patch1939923:   skip_test_rhbz1939923.patch
 Patch2:		disable_static_tests_part1.patch
 Patch3:		disable_static_tests_part2.patch
 Patch5:		modify_go.env.patch
-Patch6:		re-enable-cgo.patch
 Patch7:		skip_TestCrashDumpsAllThreads.patch
 
 # Having documentation separate was broken
@@ -244,9 +243,10 @@ pushd ..
 tar -xf %{SOURCE1}
 popd
 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 < $p
+	patch -p1 --no-backup-if-mismatch < $p
 done
 
 # Configure crypto tests
@@ -521,6 +521,13 @@ cd ..
 %endif
 
 %changelog
+* Thu May 23 2024 David Benoit <dbenoit@redhat.com> - 1.22.3-1
+- Update to Go 1.22.3
+- Resolves: RHEL-35884
+- Resolves: RHEL-35075
+- Resolves: RHEL-35632
+- Resolves: RHEL-35901
+
 * Thu May 02 2024 Alejandro Sáez <asm@redhat.com> - 1.22.2-1
 - Rebase to 1.22.2
 - Re-enable CGO
diff --git a/sources b/sources
index 2ed4166..0c050bd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (go1.22.2.tar.gz) = c9c6f0a745229a41ff17fdb5192a5700c5eead2dfd7c3de9273ccfda64db0ee73dceb6bfc5d7cd2df87e31bbee53b96360742a9f853c79456bb178f2da001065
-SHA512 (go1.22.2-1-openssl-fips.tar.gz) = 01a7924f86be2030207b32bbac5b0b4f5b5e8430349eb1d0a1ade8a48536e4402fdf000f8c07e7bd270df338e5f97553f6933045ad96411aa9b2dfd7f127d280
+SHA512 (go1.22.3-1-openssl-fips.tar.gz) = a666fffd3459598b0ac7b93e5dd9d3925877fc5cc6a140bf6e97831013204b13224149f888e2bd3ef0e2629d46ac838aacd40a8668606c50342556b506a9a5d6
+SHA512 (go1.22.3.tar.gz) = f17e489672bf791b9631891c134b0466afce29fea68e5c148d3d3cb57519e0f2b10f3b63234ab1ab445315761c2f3d7ececf78cc8b1e2bbb43879c543058ae00