diff --git a/.drone.yml b/.drone.yml
index 06995b5..8542231 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,7 +5,7 @@ name: default
 
 steps:
   - name: Build live-cd Image
-    image: debian:buster
+    image: debian:bullseye
     privileged: true
     commands:
       - apt update
diff --git a/auto/config b/auto/config
index e3cf02b..7861a87 100755
--- a/auto/config
+++ b/auto/config
@@ -2,7 +2,6 @@
 
 lb config noauto \
 	--architectures amd64 \
-	--distribution buster \
-	--backports true \
+	--distribution bullseye \
 	--bootappend-live "boot=live components initrd=/live/initrd.img keyboard-layouts=de" \
 	"${@}"
diff --git a/build-live-cd.sh b/build-live-cd.sh
index 71aacf2..863899c 100755
--- a/build-live-cd.sh
+++ b/build-live-cd.sh
@@ -4,10 +4,10 @@ NAME=debian-live-cd-$ID
 DIR=$BASEDIR/$NAME
 
 echo "Generating container under $DIR"
-zfs snapshot ztstor/ROOT/archie/var/lib/machines/buster-template@${ID}
+zfs snapshot ztstor/ROOT/archie/var/lib/machines/bullseye-template@${ID}
 zfs clone \
     -o mountpoint=$DIR \
-    ztstor/ROOT/archie/var/lib/machines/buster-template@${ID} \
+    ztstor/ROOT/archie/var/lib/machines/bullseye-template@${ID} \
     ztstor/ROOT/archie/var/lib/machines/$NAME
 
 mkdir $DIR/var/live-build/
diff --git a/config/build b/config/build
index 5cd9ebe..94e8f90 100644
--- a/config/build
+++ b/config/build
@@ -1,7 +1,7 @@
 [Image]
 Architecture: amd64
 Archive-Areas: main contrib non-free
-Distribution: buster
+Distribution: bullseye
 Mirror-Bootstrap: http://deb.debian.org/debian/
 
 [FIXME]
diff --git a/config/package-lists/zfs.list.chroot b/config/package-lists/zfs.list.chroot
index 9452000..db9f49b 100644
--- a/config/package-lists/zfs.list.chroot
+++ b/config/package-lists/zfs.list.chroot
@@ -1,3 +1,3 @@
 linux-headers-amd64
-zfs-dkms/buster-backports
-zfsutils-linux/buster-backports
+zfs-dkms
+zfsutils-linux