diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 4b0937c71..422e9395f 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1524,7 +1524,7 @@ __check_dpkg_architecture() {
             else
                 # Saltstack official repository has arm64 metadata beginning with Debian 11,
                 # use amd64 repositories on arm64 for anything older, since all pkgs are arch-independent
-                if [ "$DISTRO_NAME_L" = "debian" ] || [ "$DISTRO_MAJOR_VERSION" -lt 11 ]; then
+                if [ "$DISTRO_NAME_L" = "debian" ] && [ "$DISTRO_MAJOR_VERSION" -lt 11 ]; then
                   __REPO_ARCH="amd64"
                 else
                   __REPO_ARCH="arm64"
@@ -1710,6 +1710,14 @@ __debian_codename_translation() {
         "11")
             DISTRO_CODENAME="bullseye"
             ;;
+        "12")
+            DISTRO_CODENAME="bookworm"
+            # FIXME - TEMPORARY
+            # use bullseye packages until bookworm packages are available
+            DISTRO_CODENAME="bullseye"
+            DISTRO_MAJOR_VERSION=11
+            rv=11
+            ;;
         *)
             DISTRO_CODENAME="stretch"
             ;;