diff --git a/.gitignore b/.gitignore
index eff41bc..c6ba692 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,5 @@
 /go1.22.3.tar.gz
 /go1.22.3-2-openssl-fips.tar.gz
 /go1.22.3-3-openssl-fips.tar.gz
+/go1.22.4.tar.gz
+/go1.22.4-1-openssl-fips.tar.gz
diff --git a/golang.spec b/golang.spec
index 2e434ce..56a2939 100644
--- a/golang.spec
+++ b/golang.spec
@@ -93,13 +93,13 @@
 %endif
 
 %global go_api 1.22
-%global go_version 1.22.3
+%global go_version 1.22.4
 %global version %{go_version}
-%global pkg_release 3
+%global pkg_release 1
 
 Name:           golang
 Version:        %{version}
-Release:        3%{?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
@@ -529,6 +529,10 @@ cd ..
 %files -n go-toolset
 
 %changelog
+* Thu Jun 6 2024 Archana Ravindar <aravinda@redhat.com> - 1.22.4-1
+- Rebase to Go1.22.4 that includes fixes for CVE-2024-24789 and CVE-2024-24790
+- Resolves: RHEL-40156
+
 * Thu May 30 2024 Derek Parker <deparker@redhat.com> - 1.22.3-3
 - Update openssl backend
 - Resolves: RHEL-36101
diff --git a/sources b/sources
index c740ed2..0ff7936 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (go1.22.3-3-openssl-fips.tar.gz) = e3bf9316e08116f0efef8034c845a62f893271ee821589e61fb8087e9ccfb15e82febd26c6a56c2c22483fac106ca36c63b9f8f0cae7cdcbd109730f5509ab04
-SHA512 (go1.22.3.tar.gz) = f17e489672bf791b9631891c134b0466afce29fea68e5c148d3d3cb57519e0f2b10f3b63234ab1ab445315761c2f3d7ececf78cc8b1e2bbb43879c543058ae00
+SHA512 (go1.22.4.tar.gz) = 0d12fed902663294530887e59c70ae2499c7fefae093cf9b5f77243e94948ac687199284765e38fb5adf1ba32bdbe4abb210877f3ce097679e4ed612ef163225
+SHA512 (go1.22.4-1-openssl-fips.tar.gz) = c383eb261594dd141394ba57612b288309c24bab1c3a968fa5b99f110e1c913973efd163a5093b4658932f3747faa97830005b1b5b3b9be370fe62a81e1e8f37