diff --git a/.gitignore b/.gitignore
index dfd60b3..de4218f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -143,3 +143,6 @@
 /go1.21.4.src.tar.gz
 /go1.21.5.src.tar.gz
 /go1.21.6.src.tar.gz
+/go1.22rc1.src.tar.gz
+/go1.22rc2.src.tar.gz
+/go1.22.0.src.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
index 7527ea8..420f0da 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -12,22 +12,20 @@ actions:
     - bash -c "echo - New release ${PACKIT_PROJECT_VERSION}"
 
 jobs:
-  # Fedora 38 follows Go 1.20
-  - job: pull_from_upstream
-    trigger: release
-    dist_git_branches: fedora-38
-    upstream_tag_include: "^go1.20.+"
-
   # Fedora 39 follows Go 1.21
+  # Fedora 38 now follows Go 1.21 since Go 1.20 went EOL
   - job: pull_from_upstream
     trigger: release
-    dist_git_branches: fedora-39
+    dist_git_branches:
+      - fedora-38
+      - fedora-39
     upstream_tag_include: "^go1.21.+"
 
   # Fedora Rawhide follows the latest version
   - job: pull_from_upstream
     trigger: release
     dist_git_branches: fedora-rawhide
+    upstream_tag_include: "^go1.22.+"
 
   # Run Koji builds when Packit pull requests are merged
   - job: koji_build
diff --git a/0005-Skip-TestCrashDumpsAllThreads.patch b/0005-Skip-TestCrashDumpsAllThreads.patch
new file mode 100644
index 0000000..34a84b3
--- /dev/null
+++ b/0005-Skip-TestCrashDumpsAllThreads.patch
@@ -0,0 +1,28 @@
+From c0c22e2aa7d1901c97da04f834ce9c7b9e38be80 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= <asm@redhat.com>
+Date: Sun, 11 Feb 2024 12:08:35 +0100
+Subject: [PATCH] Skip TestCrashDumpsAllThreads
+
+See golang.org/issues/64650
+---
+ src/runtime/crash_unix_test.go | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/runtime/crash_unix_test.go b/src/runtime/crash_unix_test.go
+index 123a462423..a0034d6455 100644
+--- a/src/runtime/crash_unix_test.go
++++ b/src/runtime/crash_unix_test.go
+@@ -74,6 +74,10 @@ func TestCrashDumpsAllThreads(t *testing.T) {
+ 		t.Skip("skipping; SIGQUIT is blocked, see golang.org/issue/19196")
+ 	}
+ 
++	if runtime.GOOS == "linux" && runtime.GOARCH == "s390x" {
++		t.Skip("skipping; frequent TestCrashDumpsAllThreads failures on linux/s390x, see golang.org/issue/64650")
++	}
++
+ 	testenv.MustHaveGoBuild(t)
+ 
+ 	if strings.Contains(os.Getenv("GOFLAGS"), "mayMoreStackPreempt") {
+-- 
+2.43.0
+
diff --git a/README.packit b/README.packit
index 115b422..29cc7d8 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.88.0.post1.dev4+gc070191b.
+The file was generated using packit 0.90.0.post1.dev9+g1f0325d1.
diff --git a/golang.spec b/golang.spec
index 2e9dae9..41392c8 100644
--- a/golang.spec
+++ b/golang.spec
@@ -104,9 +104,9 @@
 %endif
 
 # Comment out go_prerelease and go_patch as needed
-%global go_api 1.21
-#global go_prerelease rc3
-%global go_patch 6
+%global go_api 1.22
+#global go_prerelease rc2
+%global go_patch 0
 
 %global go_version %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease:~%{go_prerelease}}
 %global go_source %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease}
@@ -139,17 +139,18 @@ BuildRequires:  pcre2-devel, glibc-static, perl-interpreter, procps-ng
 Provides:       go = %{version}-%{release}
 
 # Bundled/Vendored provides generated by bundled-deps.sh based on the in tree module data
-Provides: bundled(golang(github.com/google/pprof)) = 0.0.0.20221118152302.e6195bd50e26
-Provides: bundled(golang(github.com/ianlancetaylor/demangle)) = 0.0.0.20220319035150.800ac71e25c2
-Provides: bundled(golang(golang.org/x/arch)) = 0.4.0
-Provides: bundled(golang(golang.org/x/crypto)) = 0.11.1.0.20230711161743.2e82bdd1719d
-Provides: bundled(golang(golang.org/x/mod)) = 0.12.0
-Provides: bundled(golang(golang.org/x/net)) = 0.12.1.0.20231027154334.5ca955b1789c
-Provides: bundled(golang(golang.org/x/sync)) = 0.3.0
-Provides: bundled(golang(golang.org/x/sys)) = 0.10.0
-Provides: bundled(golang(golang.org/x/term)) = 0.10.0
-Provides: bundled(golang(golang.org/x/text)) = 0.11.0
-Provides: bundled(golang(golang.org/x/tools)) = 0.11.1.0.20230712164437.1ca21856af7b
+Provides: bundled(golang(github.com/google/pprof)) = 0.0.0.20230811205829.9131a7e9cc17
+Provides: bundled(golang(github.com/ianlancetaylor/demangle)) = 0.0.0.20230524184225.eabc099b10ab
+Provides: bundled(golang(golang.org/x/arch)) = 0.6.0
+Provides: bundled(golang(golang.org/x/crypto)) = 0.16.1.0.20231129163542.152cdb1503eb
+Provides: bundled(golang(golang.org/x/mod)) = 0.14.0
+Provides: bundled(golang(golang.org/x/net)) = 0.19.0
+Provides: bundled(golang(golang.org/x/sync)) = 0.5.0
+Provides: bundled(golang(golang.org/x/sys)) = 0.15.0
+Provides: bundled(golang(golang.org/x/term)) = 0.15.0
+Provides: bundled(golang(golang.org/x/text)) = 0.14.0
+Provides: bundled(golang(golang.org/x/tools)) = 0.16.2.0.20231218185909.83bceaf2424d
+
 
 Requires:       %{name}-bin = %{version}-%{release}
 Requires:       %{name}-src = %{version}-%{release}
@@ -157,6 +158,7 @@ Requires:       go-filesystem
 
 Patch1:         0001-Modify-go.env.patch
 Patch4:         0004-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch
+Patch5:		0005-Skip-TestCrashDumpsAllThreads.patch
 
 # Having documentation separate was broken
 Obsoletes:      %{name}-docs < 1.1-4
diff --git a/sources b/sources
index 9cdba27..ddd1e97 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (go1.21.6.src.tar.gz) = 8472c1c6c3fae9fecfb512a16f18ed531c04c087429a75086b9999069330c1b1e4a01a30c6561b5092169144cbc0d787ec2f5f4a50dfc4f79e74398f16423cfd
+SHA512 (go1.22.0.src.tar.gz) = f47fdac3281463757b3db9f6ab747f86ed7263beed52c820ec2571375a578034df02c0b76912c19fab3a58df3b04d79b6aae084163d1d5847c907aeb30b936e3