diff --git a/raspbian/raspbian-bullseye b/raspbian/raspbian-bullseye
new file mode 120000
index 000000000..4f11d80de
--- /dev/null
+++ b/raspbian/raspbian-bullseye
@@ -0,0 +1 @@
+../debian/bullseye
\ No newline at end of file
diff --git a/raspbian/raspbian-jessie b/raspbian/raspbian-jessie
deleted file mode 120000
index bb30193d5..000000000
--- a/raspbian/raspbian-jessie
+++ /dev/null
@@ -1 +0,0 @@
-../debian/jessie
\ No newline at end of file
diff --git a/ubuntu/eoan b/ubuntu/eoan
deleted file mode 120000
index e7c887a6f..000000000
--- a/ubuntu/eoan
+++ /dev/null
@@ -1 +0,0 @@
-_base
\ No newline at end of file
diff --git a/debian/wheezy b/ubuntu/hirsute
similarity index 100%
rename from debian/wheezy
rename to ubuntu/hirsute
diff --git a/ubuntu/disco b/ubuntu/impish
similarity index 100%
rename from ubuntu/disco
rename to ubuntu/impish