diff --git a/.gitignore b/.gitignore
index 8e2a647..dfd60b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -142,3 +142,4 @@
 /go1.21.3.src.tar.gz
 /go1.21.4.src.tar.gz
 /go1.21.5.src.tar.gz
+/go1.21.6.src.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
index 4d86a08..7527ea8 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -1,21 +1,40 @@
-upstream_package_name: go
-downstream_package_name: golang
-upstream_project_url: https://github.com/golang/go
 specfile_path: golang.spec
+files_to_sync:
+  - golang.spec
+  - .packit.yaml
+upstream_package_name: go
+upstream_project_url: https://github.com/golang/go
+downstream_package_name: golang
 upstream_tag_template: go{version}
+
 actions:
   changelog-entry:
-  - bash -c "echo - New release ${PACKIT_PROJECT_VERSION}"
+    - 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-rawhide
-      - fedora-stable
+    dist_git_branches: fedora-38
+    upstream_tag_include: "^go1.20.+"
 
+  # Fedora 39 follows Go 1.21
+  - job: pull_from_upstream
+    trigger: release
+    dist_git_branches: fedora-39
+    upstream_tag_include: "^go1.21.+"
+
+  # Fedora Rawhide follows the latest version
+  - job: pull_from_upstream
+    trigger: release
+    dist_git_branches: fedora-rawhide
+
+  # Run Koji builds when Packit pull requests are merged
   - job: koji_build
     trigger: commit
-    dist_git_branches:
-      - fedora-rawhide
-      - fedora-stable
+    dist_git_branches: fedora-all
 
+  # Create Bodhi updates in all Fedora stable versions
+  - job: bodhi_update
+    trigger: commit
+    dist_git_branches: fedora-all
diff --git a/README.packit b/README.packit
index d7c433c..115b422 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.78.2.post2+g81828af.
+The file was generated using packit 0.88.0.post1.dev4+gc070191b.
diff --git a/golang.spec b/golang.spec
index 9410387..286f316 100644
--- a/golang.spec
+++ b/golang.spec
@@ -106,7 +106,7 @@
 # Comment out go_prerelease and go_patch as needed
 %global go_api 1.21
 #global go_prerelease rc3
-%global go_patch 5
+%global go_patch 6
 
 %global go_version %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease:~%{go_prerelease}}
 %global go_source %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease}
diff --git a/sources b/sources
index b38a815..9cdba27 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (go1.21.5.src.tar.gz) = c064b7cb3c47d8fb99fc181a3cddf327a4b7a8c6af39a8ac568e9d74cd44903141680903ca48673bb02a7a159cce4f32a94f3b37fc65a9549d3518ad7c731fa3
+SHA512 (go1.21.6.src.tar.gz) = 8472c1c6c3fae9fecfb512a16f18ed531c04c087429a75086b9999069330c1b1e4a01a30c6561b5092169144cbc0d787ec2f5f4a50dfc4f79e74398f16423cfd