diff --git a/10/buster/Dockerfile b/10/bullseye/Dockerfile
similarity index 96%
rename from 10/buster/Dockerfile
rename to 10/bullseye/Dockerfile
index f0b62f7fa7..6fa86355d0 100644
--- a/10/buster/Dockerfile
+++ b/10/bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 RUN set -ex; \
 	if ! command -v gpg > /dev/null; then \
@@ -90,7 +90,7 @@ RUN set -ex; \
 ENV PG_MAJOR 10
 ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
 
-ENV PG_VERSION 10.18-1.pgdg100+1
+ENV PG_VERSION 10.18-1.pgdg110+1
 
 RUN set -ex; \
 	\
@@ -99,15 +99,15 @@ RUN set -ex; \
 	\
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "$dpkgArch" in \
-		amd64 | arm64 | i386 | ppc64el) \
+		amd64 | arm64 | ppc64el) \
 # arches officialy built by upstream
-			echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
+			echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
 			apt-get update; \
 			;; \
 		*) \
 # we're on an architecture upstream doesn't officially build for
 # let's build binaries from their published source packages
-			echo "deb-src http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
+			echo "deb-src http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
 			\
 			tempDir="$(mktemp -d)"; \
 			cd "$tempDir"; \
diff --git a/10/buster/docker-entrypoint.sh b/10/bullseye/docker-entrypoint.sh
similarity index 100%
rename from 10/buster/docker-entrypoint.sh
rename to 10/bullseye/docker-entrypoint.sh
diff --git a/11/buster/Dockerfile b/11/bullseye/Dockerfile
similarity index 96%
rename from 11/buster/Dockerfile
rename to 11/bullseye/Dockerfile
index b785bd92f3..a1a09dca40 100644
--- a/11/buster/Dockerfile
+++ b/11/bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 RUN set -ex; \
 	if ! command -v gpg > /dev/null; then \
@@ -90,7 +90,7 @@ RUN set -ex; \
 ENV PG_MAJOR 11
 ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
 
-ENV PG_VERSION 11.13-1.pgdg100+1
+ENV PG_VERSION 11.13-1.pgdg110+1
 
 RUN set -ex; \
 	\
@@ -99,15 +99,15 @@ RUN set -ex; \
 	\
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "$dpkgArch" in \
-		amd64 | arm64 | i386 | ppc64el) \
+		amd64 | arm64 | ppc64el) \
 # arches officialy built by upstream
-			echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
+			echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
 			apt-get update; \
 			;; \
 		*) \
 # we're on an architecture upstream doesn't officially build for
 # let's build binaries from their published source packages
-			echo "deb-src http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
+			echo "deb-src http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
 			\
 			tempDir="$(mktemp -d)"; \
 			cd "$tempDir"; \
diff --git a/11/buster/docker-entrypoint.sh b/11/bullseye/docker-entrypoint.sh
similarity index 100%
rename from 11/buster/docker-entrypoint.sh
rename to 11/bullseye/docker-entrypoint.sh
diff --git a/12/buster/Dockerfile b/12/bullseye/Dockerfile
similarity index 96%
rename from 12/buster/Dockerfile
rename to 12/bullseye/Dockerfile
index 60421570c8..56e1c40a54 100644
--- a/12/buster/Dockerfile
+++ b/12/bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 RUN set -ex; \
 	if ! command -v gpg > /dev/null; then \
@@ -90,7 +90,7 @@ RUN set -ex; \
 ENV PG_MAJOR 12
 ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
 
-ENV PG_VERSION 12.8-1.pgdg100+1
+ENV PG_VERSION 12.8-1.pgdg110+1
 
 RUN set -ex; \
 	\
@@ -99,15 +99,15 @@ RUN set -ex; \
 	\
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "$dpkgArch" in \
-		amd64 | arm64 | i386 | ppc64el) \
+		amd64 | arm64 | ppc64el) \
 # arches officialy built by upstream
-			echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
+			echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
 			apt-get update; \
 			;; \
 		*) \
 # we're on an architecture upstream doesn't officially build for
 # let's build binaries from their published source packages
-			echo "deb-src http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
+			echo "deb-src http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
 			\
 			tempDir="$(mktemp -d)"; \
 			cd "$tempDir"; \
diff --git a/12/buster/docker-entrypoint.sh b/12/bullseye/docker-entrypoint.sh
similarity index 100%
rename from 12/buster/docker-entrypoint.sh
rename to 12/bullseye/docker-entrypoint.sh
diff --git a/13/buster/Dockerfile b/13/bullseye/Dockerfile
similarity index 96%
rename from 13/buster/Dockerfile
rename to 13/bullseye/Dockerfile
index c7b67f9ee6..f4d1ff3070 100644
--- a/13/buster/Dockerfile
+++ b/13/bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 RUN set -ex; \
 	if ! command -v gpg > /dev/null; then \
@@ -90,7 +90,7 @@ RUN set -ex; \
 ENV PG_MAJOR 13
 ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
 
-ENV PG_VERSION 13.4-1.pgdg100+1
+ENV PG_VERSION 13.4-1.pgdg110+1
 
 RUN set -ex; \
 	\
@@ -99,15 +99,15 @@ RUN set -ex; \
 	\
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "$dpkgArch" in \
-		amd64 | arm64 | i386 | ppc64el) \
+		amd64 | arm64 | ppc64el) \
 # arches officialy built by upstream
-			echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
+			echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
 			apt-get update; \
 			;; \
 		*) \
 # we're on an architecture upstream doesn't officially build for
 # let's build binaries from their published source packages
-			echo "deb-src http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
+			echo "deb-src http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
 			\
 			tempDir="$(mktemp -d)"; \
 			cd "$tempDir"; \
diff --git a/13/buster/docker-entrypoint.sh b/13/bullseye/docker-entrypoint.sh
similarity index 100%
rename from 13/buster/docker-entrypoint.sh
rename to 13/bullseye/docker-entrypoint.sh
diff --git a/14/buster/Dockerfile b/14/bullseye/Dockerfile
similarity index 96%
rename from 14/buster/Dockerfile
rename to 14/bullseye/Dockerfile
index f1582305ff..174e4d341d 100644
--- a/14/buster/Dockerfile
+++ b/14/bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 RUN set -ex; \
 	if ! command -v gpg > /dev/null; then \
@@ -90,7 +90,7 @@ RUN set -ex; \
 ENV PG_MAJOR 14
 ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
 
-ENV PG_VERSION 14~beta3-1.pgdg100+1
+ENV PG_VERSION 14~beta3-1.pgdg110+1
 
 RUN set -ex; \
 	\
@@ -99,15 +99,15 @@ RUN set -ex; \
 	\
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "$dpkgArch" in \
-		amd64 | arm64 | i386 | ppc64el) \
+		amd64 | arm64 | ppc64el) \
 # arches officialy built by upstream
-			echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
+			echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
 			apt-get update; \
 			;; \
 		*) \
 # we're on an architecture upstream doesn't officially build for
 # let's build binaries from their published source packages
-			echo "deb-src http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
+			echo "deb-src http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
 			\
 			tempDir="$(mktemp -d)"; \
 			cd "$tempDir"; \
diff --git a/14/buster/docker-entrypoint.sh b/14/bullseye/docker-entrypoint.sh
similarity index 100%
rename from 14/buster/docker-entrypoint.sh
rename to 14/bullseye/docker-entrypoint.sh
diff --git a/9.6/buster/Dockerfile b/9.6/bullseye/Dockerfile
similarity index 96%
rename from 9.6/buster/Dockerfile
rename to 9.6/bullseye/Dockerfile
index 87206125a8..1d8ae0a1f8 100644
--- a/9.6/buster/Dockerfile
+++ b/9.6/bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 RUN set -ex; \
 	if ! command -v gpg > /dev/null; then \
@@ -90,7 +90,7 @@ RUN set -ex; \
 ENV PG_MAJOR 9.6
 ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
 
-ENV PG_VERSION 9.6.23-1.pgdg100+1
+ENV PG_VERSION 9.6.23-1.pgdg110+1
 
 RUN set -ex; \
 	\
@@ -99,15 +99,15 @@ RUN set -ex; \
 	\
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "$dpkgArch" in \
-		amd64 | arm64 | i386 | ppc64el) \
+		amd64 | arm64 | ppc64el) \
 # arches officialy built by upstream
-			echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
+			echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
 			apt-get update; \
 			;; \
 		*) \
 # we're on an architecture upstream doesn't officially build for
 # let's build binaries from their published source packages
-			echo "deb-src http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
+			echo "deb-src http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
 			\
 			tempDir="$(mktemp -d)"; \
 			cd "$tempDir"; \
diff --git a/9.6/buster/docker-entrypoint.sh b/9.6/bullseye/docker-entrypoint.sh
similarity index 100%
rename from 9.6/buster/docker-entrypoint.sh
rename to 9.6/bullseye/docker-entrypoint.sh
diff --git a/apply-templates.sh b/apply-templates.sh
index 58c8f441cb..327488eaeb 100755
--- a/apply-templates.sh
+++ b/apply-templates.sh
@@ -37,6 +37,8 @@ for version; do
 	variants="$(jq -r '.[env.version].debianSuites + ["alpine"] | map(@sh) | join(" ")' versions.json)"
 	eval "variants=( $variants )"
 
+	rm -rf "$version"
+
 	for variant in "${variants[@]}"; do
 		export variant
 
diff --git a/versions.json b/versions.json
index 300f48ed7b..83d4758eb2 100644
--- a/versions.json
+++ b/versions.json
@@ -1,18 +1,17 @@
 {
   "10": {
     "alpine": "3.14",
-    "buster": {
+    "bullseye": {
       "arches": [
         "amd64",
         "arm64",
-        "i386",
         "ppc64el"
       ],
-      "version": "10.18-1.pgdg100+1"
+      "version": "10.18-1.pgdg110+1"
     },
     "debian": "stretch",
     "debianSuites": [
-      "buster",
+      "bullseye",
       "stretch"
     ],
     "major": 10,
@@ -29,18 +28,17 @@
   },
   "11": {
     "alpine": "3.14",
-    "buster": {
+    "bullseye": {
       "arches": [
         "amd64",
         "arm64",
-        "i386",
         "ppc64el"
       ],
-      "version": "11.13-1.pgdg100+1"
+      "version": "11.13-1.pgdg110+1"
     },
     "debian": "stretch",
     "debianSuites": [
-      "buster",
+      "bullseye",
       "stretch"
     ],
     "major": 11,
@@ -57,18 +55,17 @@
   },
   "12": {
     "alpine": "3.14",
-    "buster": {
+    "bullseye": {
       "arches": [
         "amd64",
         "arm64",
-        "i386",
         "ppc64el"
       ],
-      "version": "12.8-1.pgdg100+1"
+      "version": "12.8-1.pgdg110+1"
     },
-    "debian": "buster",
+    "debian": "bullseye",
     "debianSuites": [
-      "buster"
+      "bullseye"
     ],
     "major": 12,
     "sha256": "e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a",
@@ -76,18 +73,17 @@
   },
   "13": {
     "alpine": "3.14",
-    "buster": {
+    "bullseye": {
       "arches": [
         "amd64",
         "arm64",
-        "i386",
         "ppc64el"
       ],
-      "version": "13.4-1.pgdg100+1"
+      "version": "13.4-1.pgdg110+1"
     },
-    "debian": "buster",
+    "debian": "bullseye",
     "debianSuites": [
-      "buster"
+      "bullseye"
     ],
     "major": 13,
     "sha256": "ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd",
@@ -95,18 +91,17 @@
   },
   "14": {
     "alpine": "3.14",
-    "buster": {
+    "bullseye": {
       "arches": [
         "amd64",
         "arm64",
-        "i386",
         "ppc64el"
       ],
-      "version": "14~beta3-1.pgdg100+1"
+      "version": "14~beta3-1.pgdg110+1"
     },
-    "debian": "buster",
+    "debian": "bullseye",
     "debianSuites": [
-      "buster"
+      "bullseye"
     ],
     "major": 14,
     "sha256": "2ea265980193db70106576201a2fee5b2d72bf9890d3911ddd374d4830624bfa",
@@ -114,18 +109,17 @@
   },
   "9.6": {
     "alpine": "3.14",
-    "buster": {
+    "bullseye": {
       "arches": [
         "amd64",
         "arm64",
-        "i386",
         "ppc64el"
       ],
-      "version": "9.6.23-1.pgdg100+1"
+      "version": "9.6.23-1.pgdg110+1"
     },
     "debian": "stretch",
     "debianSuites": [
-      "buster",
+      "bullseye",
       "stretch"
     ],
     "major": 9,
diff --git a/versions.sh b/versions.sh
index 3d2cd02d9b..c02b45b63f 100755
--- a/versions.sh
+++ b/versions.sh
@@ -2,14 +2,14 @@
 set -Eeuo pipefail
 
 # https://github.com/docker-library/postgres/issues/582 😬
-defaultDebianSuite='buster'
+defaultDebianSuite='bullseye'
 declare -A debianSuites=(
 	[9.6]='stretch'
 	[10]='stretch'
 	[11]='stretch'
 )
 allDebianSuites=(
-	buster
+	bullseye
 	stretch
 )
 defaultAlpineVersion='3.14'
@@ -89,7 +89,7 @@ for version in "${versions[@]}"; do
 	for suite in "${allDebianSuites[@]}"; do
 		versionDebianSuites+=( "$suite" )
 		if [ "$suite" = "$versionDebianSuite" ]; then
-			# if our default is "buster" we shouldn't even consider "stretch"
+			# if our default is newer than stretch we shouldn't even consider providing stretch
 			break
 		fi
 	done