diff --git a/bootstrap/generate_bootstrap_plans b/bootstrap/generate_bootstrap_plans
index 19a3c5f4543..b1bd51378e7 100755
--- a/bootstrap/generate_bootstrap_plans
+++ b/bootstrap/generate_bootstrap_plans
@@ -3,7 +3,7 @@ PATH+=:$PWD/jq-bin/bin
 
 ghcs_nix="https://gitlab.haskell.org/bgamari/ghcs-nix/-/archive/master/ghcs-nix-master.tar.gz"
 
-nix build -f "$ghcs_nix" ghc-8_10_7 -o boot_ghc
+nix build -f "$ghcs_nix" ghc-9_6_5 -o boot_ghc
 
 run() {
   local ver="$1"
diff --git a/bootstrap/linux-9.0.2.json b/bootstrap/linux-9.0.2.json
index 4533f52fcf9..dbce3b7a189 100644
--- a/bootstrap/linux-9.0.2.json
+++ b/bootstrap/linux-9.0.2.json
@@ -414,24 +414,24 @@
             "version": "2.0.2"
         },
         {
-            "cabal_sha256": "619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba",
+            "cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
             "component": "lib:tar-internal",
             "flags": [],
             "package": "tar",
             "revision": 0,
             "source": "hackage",
-            "src_sha256": "08c61e82b59ed6fe7e85e9fe7cceaaf853ba54511d1ec57efa511ddc55ef1998",
-            "version": "0.6.2.0"
+            "src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
+            "version": "0.6.3.0"
         },
         {
-            "cabal_sha256": "619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba",
+            "cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
             "component": "lib:tar",
             "flags": [],
             "package": "tar",
             "revision": 0,
             "source": "hackage",
-            "src_sha256": "08c61e82b59ed6fe7e85e9fe7cceaaf853ba54511d1ec57efa511ddc55ef1998",
-            "version": "0.6.2.0"
+            "src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
+            "version": "0.6.3.0"
         },
         {
             "cabal_sha256": "64a1925c93e9a26cd4c40c470736950c4b5ea7bae68418cb996c5c7df4873cba",
diff --git a/bootstrap/linux-9.2.8.json b/bootstrap/linux-9.2.8.json
index 9ce9847a68c..a31da71f5b8 100644
--- a/bootstrap/linux-9.2.8.json
+++ b/bootstrap/linux-9.2.8.json
@@ -374,24 +374,24 @@
             "version": "2.0.2"
         },
         {
-            "cabal_sha256": "619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba",
+            "cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
             "component": "lib:tar-internal",
             "flags": [],
             "package": "tar",
             "revision": 0,
             "source": "hackage",
-            "src_sha256": "08c61e82b59ed6fe7e85e9fe7cceaaf853ba54511d1ec57efa511ddc55ef1998",
-            "version": "0.6.2.0"
+            "src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
+            "version": "0.6.3.0"
         },
         {
-            "cabal_sha256": "619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba",
+            "cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
             "component": "lib:tar",
             "flags": [],
             "package": "tar",
             "revision": 0,
             "source": "hackage",
-            "src_sha256": "08c61e82b59ed6fe7e85e9fe7cceaaf853ba54511d1ec57efa511ddc55ef1998",
-            "version": "0.6.2.0"
+            "src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
+            "version": "0.6.3.0"
         },
         {
             "cabal_sha256": "64a1925c93e9a26cd4c40c470736950c4b5ea7bae68418cb996c5c7df4873cba",
diff --git a/bootstrap/linux-9.4.8.json b/bootstrap/linux-9.4.8.json
index 1d314b39002..9aa58c649a4 100644
--- a/bootstrap/linux-9.4.8.json
+++ b/bootstrap/linux-9.4.8.json
@@ -364,24 +364,24 @@
             "version": "2.0.2"
         },
         {
-            "cabal_sha256": "619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba",
+            "cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
             "component": "lib:tar-internal",
             "flags": [],
             "package": "tar",
             "revision": 0,
             "source": "hackage",
-            "src_sha256": "08c61e82b59ed6fe7e85e9fe7cceaaf853ba54511d1ec57efa511ddc55ef1998",
-            "version": "0.6.2.0"
+            "src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
+            "version": "0.6.3.0"
         },
         {
-            "cabal_sha256": "619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba",
+            "cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
             "component": "lib:tar",
             "flags": [],
             "package": "tar",
             "revision": 0,
             "source": "hackage",
-            "src_sha256": "08c61e82b59ed6fe7e85e9fe7cceaaf853ba54511d1ec57efa511ddc55ef1998",
-            "version": "0.6.2.0"
+            "src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
+            "version": "0.6.3.0"
         },
         {
             "cabal_sha256": "64a1925c93e9a26cd4c40c470736950c4b5ea7bae68418cb996c5c7df4873cba",
diff --git a/bootstrap/linux-9.6.4.json b/bootstrap/linux-9.6.4.json
index c827a8e3987..46e00aa109d 100644
--- a/bootstrap/linux-9.6.4.json
+++ b/bootstrap/linux-9.6.4.json
@@ -336,24 +336,24 @@
             "version": "2.0.2"
         },
         {
-            "cabal_sha256": "619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba",
+            "cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
             "component": "lib:tar-internal",
             "flags": [],
             "package": "tar",
             "revision": 0,
             "source": "hackage",
-            "src_sha256": "08c61e82b59ed6fe7e85e9fe7cceaaf853ba54511d1ec57efa511ddc55ef1998",
-            "version": "0.6.2.0"
+            "src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
+            "version": "0.6.3.0"
         },
         {
-            "cabal_sha256": "619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba",
+            "cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
             "component": "lib:tar",
             "flags": [],
             "package": "tar",
             "revision": 0,
             "source": "hackage",
-            "src_sha256": "08c61e82b59ed6fe7e85e9fe7cceaaf853ba54511d1ec57efa511ddc55ef1998",
-            "version": "0.6.2.0"
+            "src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
+            "version": "0.6.3.0"
         },
         {
             "cabal_sha256": "64a1925c93e9a26cd4c40c470736950c4b5ea7bae68418cb996c5c7df4873cba",
diff --git a/bootstrap/linux-9.8.1.json b/bootstrap/linux-9.8.1.json
index e90e48bef62..568cf7fd4f5 100644
--- a/bootstrap/linux-9.8.1.json
+++ b/bootstrap/linux-9.8.1.json
@@ -340,24 +340,24 @@
       "version": "2.0.2"
     },
     {
-      "cabal_sha256": "3ed979ee1bb00b4e488537988ee6bb3c2c67e66678804125e2df08a527822b4e",
+      "cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
       "component": "lib:tar-internal",
       "flags": [],
       "package": "tar",
       "revision": 0,
       "source": "hackage",
-      "src_sha256": "edfef2e126440839d34f23fff7f3616d0bfffa0345ea13d4d0fee9a669d305da",
-      "version": "0.6.1.0"
+      "src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
+      "version": "0.6.3.0"
     },
     {
-      "cabal_sha256": "3ed979ee1bb00b4e488537988ee6bb3c2c67e66678804125e2df08a527822b4e",
+      "cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
       "component": "lib:tar",
       "flags": [],
       "package": "tar",
       "revision": 0,
       "source": "hackage",
-      "src_sha256": "edfef2e126440839d34f23fff7f3616d0bfffa0345ea13d4d0fee9a669d305da",
-      "version": "0.6.1.0"
+      "src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
+      "version": "0.6.3.0"
     },
     {
       "cabal_sha256": "13aee0a157b2362cf079a4fa0156927403aef2a9540694c9d170ac8339d17bda",
diff --git a/bootstrap/linux-9.8.2.json b/bootstrap/linux-9.8.2.json
index de3c86efd58..8b5258e6a18 100644
--- a/bootstrap/linux-9.8.2.json
+++ b/bootstrap/linux-9.8.2.json
@@ -340,24 +340,24 @@
             "version": "2.0.2"
         },
         {
-            "cabal_sha256": "619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba",
+            "cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
             "component": "lib:tar-internal",
             "flags": [],
             "package": "tar",
             "revision": 0,
             "source": "hackage",
-            "src_sha256": "08c61e82b59ed6fe7e85e9fe7cceaaf853ba54511d1ec57efa511ddc55ef1998",
-            "version": "0.6.2.0"
+            "src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
+            "version": "0.6.3.0"
         },
         {
-            "cabal_sha256": "619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba",
+            "cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
             "component": "lib:tar",
             "flags": [],
             "package": "tar",
             "revision": 0,
             "source": "hackage",
-            "src_sha256": "08c61e82b59ed6fe7e85e9fe7cceaaf853ba54511d1ec57efa511ddc55ef1998",
-            "version": "0.6.2.0"
+            "src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
+            "version": "0.6.3.0"
         },
         {
             "cabal_sha256": "64a1925c93e9a26cd4c40c470736950c4b5ea7bae68418cb996c5c7df4873cba",
diff --git a/cabal.bootstrap.project b/cabal.bootstrap.project
index 845a3fca7fd..74c8ca5e47a 100644
--- a/cabal.bootstrap.project
+++ b/cabal.bootstrap.project
@@ -9,4 +9,4 @@ packages:
 tests: False
 benchmarks: False
 
-index-state: hackage.haskell.org 2024-04-22T06:16:57Z
+index-state: hackage.haskell.org 2024-06-17T00:00:01Z
diff --git a/cabal.release.project b/cabal.release.project
index 3d73d2f19a1..5ce38e721a5 100644
--- a/cabal.release.project
+++ b/cabal.release.project
@@ -2,4 +2,4 @@ import: project-cabal/pkgs/cabal.config
 import: project-cabal/pkgs/install.config
 import: project-cabal/pkgs/tests.config
 
-index-state: hackage.haskell.org 2024-04-22T06:16:57Z
+index-state: hackage.haskell.org 2024-06-17T00:00:01Z