diff --git a/CONF.sh b/CONF.sh
index 9d0b0748..229ca295 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -70,7 +70,7 @@ if [ -z "$DI_CODENAME" ]; then
 	export DI_CODENAME=$CODENAME
 fi
 # If you want backported d-i (e.g. by setting
-# DI_CODENAME=jessie-backports, then you'll almost definitely also
+# DI_CODENAME=bookworm-backports, then you'll almost definitely also
 # want to enable BACKPORTS below as well
 
 # Should we include some packages from backports? If so, point at a
@@ -86,8 +86,8 @@ fi
 # the Debian mirror.
 #export DI_WWW_HOME=default
 
-# Version number, "2.2 r0", "2.2 r1" etc.
-export DEBVERSION="11.0.0"
+# Version number, "10.11.0", "11.1.0", "testing", etc
+export DEBVERSION="12.0.0"
 
 # Official or non-official set.
 # NOTE: THE "OFFICIAL" DESIGNATION IS ONLY ALLOWED FOR IMAGES AVAILABLE
@@ -208,8 +208,8 @@ export JIGDO_CHECKSUM="md5"
 
 # Extra keys that you might want apt to trust. List their fingerprints
 # here and debian-cd will grab them from the user's keyring as needed
-# (The example here is the buster release key)
-#export ARCHIVE_EXTRA_KEYS="80D15823B7FD1561F9F7BCDDDC30D7C23CBBABEE"
+# (The example here is the bullseye release key)
+#export ARCHIVE_EXTRA_KEYS="1F89983E0081FDE018F3CC9673A4F27B8DD47936"
 
 # By default we use debootstrap --no-check-gpg to find out the minimal set
 # of packages because there's no reason to not trust the local mirror. But
diff --git a/debian/changelog b/debian/changelog
index c170d67f..3e76dbee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,6 @@ debian-cd (3.1.36) UNRELEASED; urgency=medium
   [ Steve McIntyre ]
   * Start bookworm development, copy the bullseye dirs to bookworm as
     a start
-
   * Use $CODENAME/updates for security pre-bullseye, or
     $CODENAME-security for bullseye onwards.
 
@@ -19,6 +18,10 @@ debian-cd (3.1.36) UNRELEASED; urgency=medium
   * data/bookworm: Use Debian Edu 12 installer logo and syslinux splash image
     from src:debian-edu-artwork 2.12.0.1-1 (showing version number 12).
 
+  [ Daniel Lewart ]
+  * Update default CODENAME to bookworm in various places.
+    Closes: #994121
+
  -- Steve McIntyre <93sam@debian.org>  Mon, 26 Jul 2021 01:02:03 +0100
 
 debian-cd (3.1.35) unstable; urgency=medium
diff --git a/easy-build.sh b/easy-build.sh
index f634b569..5b2909f3 100755
--- a/easy-build.sh
+++ b/easy-build.sh
@@ -72,10 +72,10 @@ fi
 ## For what release to build images
 
 # The suite the installed system will be based on
-export CODENAME=buster
+export CODENAME=bookworm
 # The suite from which the udebs for the installer will be taken (normally
 # the same as CODENAME)
-export DI_CODENAME=buster
+export DI_CODENAME=bookworm
 
 
 ## The debian-installer images to use. This must match the suite (DI_CODENAME)