diff --git a/build/checksums.txt b/build/checksums.txt
index 006e8a5b4d..767fc88ce5 100644
--- a/build/checksums.txt
+++ b/build/checksums.txt
@@ -58,7 +58,7 @@ a5e68ae73d38748b5269fad36ac7575e3c162a5dc63ef58abdea03cc5da4522a  golangci-lint-
 # This version is fine to be old and full of security holes, we just use it
 # to build the latest Go. Don't change it.
 #
-# version:ppa-builder 1.19.6
+# version:ppa-builder-1 1.19.6
 # https://go.dev/dl/
 d7f0013f82e6d7f862cc6cb5c8cdb48eef5f2e239b35baa97e2f1a7466043767  go1.19.6.src.tar.gz
 
diff --git a/build/ci.go b/build/ci.go
index 21412a416b..abcc248ac5 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -718,7 +718,7 @@ func doDebianSource(cmdline []string) {
 				if err := build.ExtractArchive(gobootbundle, pkgdir); err != nil {
 					log.Fatalf("Failed to extract bootstrapper Go sources: %v", err)
 				}
-				if err := os.Rename(filepath.Join(pkgdir, "go"), filepath.Join(pkgdir, fmt.Sprintf(".goboot-%d", i))); err != nil {
+				if err := os.Rename(filepath.Join(pkgdir, "go"), filepath.Join(pkgdir, fmt.Sprintf(".goboot-%d", i+1))); err != nil {
 					log.Fatalf("Failed to rename bootstrapper Go source folder: %v", err)
 				}
 			}
@@ -762,7 +762,7 @@ func downloadGoBootstrapSources(cachedir string) []string {
 	csdb := build.MustLoadChecksums("build/checksums.txt")
 
 	var bundles []string
-	for _, booter := range []string{"ppa-builder", "ppa-builder-2"} {
+	for _, booter := range []string{"ppa-builder-1", "ppa-builder-2"} {
 		gobootVersion, err := build.Version(csdb, booter)
 		if err != nil {
 			log.Fatal(err)
diff --git a/build/deb/ethereum/deb.rules b/build/deb/ethereum/deb.rules
index 5a3c9169e9..cb48b23a5e 100644
--- a/build/deb/ethereum/deb.rules
+++ b/build/deb/ethereum/deb.rules
@@ -19,9 +19,9 @@ override_dh_auto_build:
 	#
 	# We're also shipping the bootstrapper as of Go 1.20 as it had minimum version
 	# requirements opposed to older versions of Go.
-	(mv .goboot-0 ../ && cd ../.goboot-0/src && ./make.bash)
-	(mv .goboot-1 ../ && cd ../.goboot-1/src && GOROOT_BOOTSTRAP=`pwd`/../../.goboot-0 ./make.bash)
-	(mv .go ../ && cd ../.go/src && GOROOT_BOOTSTRAP=`pwd`/../../.goboot-1 ./make.bash)
+	(mv .goboot-1 ../ && cd ../.goboot-1/src && ./make.bash)
+	(mv .goboot-2 ../ && cd ../.goboot-2/src && GOROOT_BOOTSTRAP=`pwd`/../../.goboot-1 ./make.bash)
+	(mv .go ../ && cd ../.go/src && GOROOT_BOOTSTRAP=`pwd`/../../.goboot-2 ./make.bash)
 
 	# We can't download external go modules within Launchpad, so we're shipping the
 	# entire dependency source cache with go-ethereum.