diff --git a/.gitignore b/.gitignore
index b2fec60..13585fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,7 @@
 /__pycache__
 /sha256sums.txt
 /upload.txt
-/docker/librewolf/debian/deb/artifacts
+/docker/librewolf/debian11/deb/artifacts
 /docker/librewolf/fedora/rpm/artifacts
 /docker/librewolf/mint/deb/artifacts
 /docker/librewolf/ubuntu/deb/artifacts
diff --git a/docker/Makefile b/docker/Makefile
index 16ca66f..ddd5b22 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -30,10 +30,10 @@ madman : prune lw mozilla
 
 
 
-debian :
-	make -C buildenv/debian
-	cp version librewolf/debian
-	make -C librewolf/debian
+debian11 :
+	make -C buildenv/debian11
+	cp version librewolf/debian11
+	make -C librewolf/debian11
 fedora :
 	make -C buildenv/fedora
 	cp version librewolf/fedora
diff --git a/docker/buildenv/Makefile b/docker/buildenv/Makefile
index 24b0b72..8560897 100644
--- a/docker/buildenv/Makefile
+++ b/docker/buildenv/Makefile
@@ -1,5 +1,5 @@
 all :
-	make -C debian
+	make -C debian11
 	make -C fedora
 	make -C ubuntu
 	make -C mint
diff --git a/docker/buildenv/debian/Makefile b/docker/buildenv/debian/Makefile
deleted file mode 100644
index d5cb196..0000000
--- a/docker/buildenv/debian/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-all :
-	sudo docker build -t mozilla/buildenv-debian .
diff --git a/docker/buildenv/debian/Dockerfile b/docker/buildenv/debian11/Dockerfile
similarity index 96%
rename from docker/buildenv/debian/Dockerfile
rename to docker/buildenv/debian11/Dockerfile
index afaccf2..64b7e58 100644
--- a/docker/buildenv/debian/Dockerfile
+++ b/docker/buildenv/debian11/Dockerfile
@@ -1,6 +1,6 @@
 # This is Debian 11, codenamed bullseye.
 
-FROM debian
+FROM debian:bullseye
 MAINTAINER Bert van der Weerd <bert@stanzabird.nl>
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Europe/Amsterdam
diff --git a/docker/buildenv/debian11/Makefile b/docker/buildenv/debian11/Makefile
new file mode 100644
index 0000000..1617295
--- /dev/null
+++ b/docker/buildenv/debian11/Makefile
@@ -0,0 +1,2 @@
+all :
+	sudo docker build -t mozilla/buildenv-debian11 .
diff --git a/docker/librewolf/Makefile b/docker/librewolf/Makefile
index ce5e3e2..a21f444 100644
--- a/docker/librewolf/Makefile
+++ b/docker/librewolf/Makefile
@@ -2,25 +2,25 @@
 
 all :
 
-	cp version debian/version && cp version fedora/version && cp version ubuntu/version && cp version mint/version && cp version arch && cp version macos && cp version windows && cp version portable-linux
+	cp version debian11/version && cp version fedora/version && cp version ubuntu/version && cp version mint/version && cp version arch && cp version macos && cp version windows && cp version portable-linux
 
 	make -C arch
 	make -C macos
 	make -C windows
 	make -C portable-linux
 
-	make -C debian
+	make -C debian11
 	make -C fedora
 	make -C mint
 	make -C ubuntu
 
 
 clean :
-	rm -f version debian/version fedora/version ubuntu/version mint/version arch/version macos/version windows/version portable-linux/version
+	rm -f version debian11/version fedora/version ubuntu/version mint/version arch/version macos/version windows/version portable-linux/version
 	make -C portable-linux clean
 
-build.debian :
-	make -C debian
+build.debian11 :
+	make -C debian11
 build.fedora :
 	make -C fedora
 build.mint :
diff --git a/docker/librewolf/debian/Makefile b/docker/librewolf/debian/Makefile
deleted file mode 100644
index 333ca8a..0000000
--- a/docker/librewolf/debian/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-all :
-	sudo docker build -t librewolf/release-debian .
-	make -C deb all
-
-no-cache :
-	sudo docker build --no-cache -t librewolf/release-debian .
-	make -C deb no-cache
-
diff --git a/docker/librewolf/debian/.gitignore b/docker/librewolf/debian11/.gitignore
similarity index 100%
rename from docker/librewolf/debian/.gitignore
rename to docker/librewolf/debian11/.gitignore
diff --git a/docker/librewolf/debian/Dockerfile b/docker/librewolf/debian11/Dockerfile
similarity index 95%
rename from docker/librewolf/debian/Dockerfile
rename to docker/librewolf/debian11/Dockerfile
index 8a3251d..4b14930 100644
--- a/docker/librewolf/debian/Dockerfile
+++ b/docker/librewolf/debian11/Dockerfile
@@ -1,4 +1,4 @@
-from mozilla/buildenv-debian
+from mozilla/buildenv-debian11
 run rm -rf mozilla-unified
 
 # Build it..
diff --git a/docker/librewolf/debian11/Makefile b/docker/librewolf/debian11/Makefile
new file mode 100644
index 0000000..e21ebd1
--- /dev/null
+++ b/docker/librewolf/debian11/Makefile
@@ -0,0 +1,8 @@
+all :
+	sudo docker build -t librewolf/release-debian11 .
+	make -C deb all
+
+no-cache :
+	sudo docker build --no-cache -t librewolf/release-debian11 .
+	make -C deb no-cache
+
diff --git a/docker/librewolf/debian/deb/Dockerfile b/docker/librewolf/debian11/deb/Dockerfile
similarity index 85%
rename from docker/librewolf/debian/deb/Dockerfile
rename to docker/librewolf/debian11/deb/Dockerfile
index 0992e29..d9a53ef 100644
--- a/docker/librewolf/debian/deb/Dockerfile
+++ b/docker/librewolf/debian11/deb/Dockerfile
@@ -1,4 +1,4 @@
-from librewolf/release-debian
+from librewolf/release-debian11
 run ./build.py --version $(cat /version) lw_artifacts
 run mkdir /artifacts
 run cp librewolf-$(cat /version).en-US.deb.zip /artifacts
diff --git a/docker/librewolf/debian/deb/Makefile b/docker/librewolf/debian11/deb/Makefile
similarity index 97%
rename from docker/librewolf/debian/deb/Makefile
rename to docker/librewolf/debian11/deb/Makefile
index 291339f..0e7960f 100644
--- a/docker/librewolf/debian/deb/Makefile
+++ b/docker/librewolf/debian11/deb/Makefile
@@ -1,4 +1,4 @@
-distro = debian
+distro = debian11
 extractor = extract5
 docker_stage = deb-$(distro)
 version = `cat ../version`
diff --git a/docker/librewolf/debian/deb/build-deb.sh b/docker/librewolf/debian11/deb/build-deb.sh
similarity index 100%
rename from docker/librewolf/debian/deb/build-deb.sh
rename to docker/librewolf/debian11/deb/build-deb.sh