diff --git a/.gitmodules b/.gitmodules
index fed9419..d1bff86 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "tauschen/directory"]
 	path = tauschen/directory
 	url = git@git.mafiasi.de:mafiasi-ag/mafiasi-directory.git
-[submodule "pizza"]
-	path = pizza
-	url = git@github.com:SocialSaturdayCoding/Apos-Container.git
 [submodule "joinoeinf/join.oeinf.de"]
 	path = joinoeinf/join.oeinf.de
 	url = git@git.mafiasi.de:oe/join.oeinf.de.git
diff --git a/base-bullseye/Dockerfile b/base-bullseye/Dockerfile
deleted file mode 100644
index a205b16..0000000
--- a/base-bullseye/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM docker.io/debian:bullseye-slim
-
-COPY sources.list /etc/apt/sources.list
-RUN apt update; apt upgrade --yes
-RUN apt install --yes --no-install-recommends vim ca-certificates procps
-RUN apt-get clean
-RUN mkdir -p /opt/config /opt/storage /opt/log
-
-ENTRYPOINT /bin/bash
diff --git a/base-bullseye/sources.list b/base-bullseye/sources.list
deleted file mode 100644
index 3230601..0000000
--- a/base-bullseye/sources.list
+++ /dev/null
@@ -1,3 +0,0 @@
-deb http://ftp.de.debian.org/debian bullseye main
-deb http://ftp.de.debian.org/debian bullseye-updates main
-deb http://security.debian.org/debian-security bullseye-security/updates main
diff --git a/base-buster/Dockerfile b/base-buster/Dockerfile
deleted file mode 100644
index 6322fd3..0000000
--- a/base-buster/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM docker.io/debian:buster-slim
-
-COPY sources.list /etc/apt/sources.list
-RUN apt update; apt upgrade --yes
-RUN apt install --yes --no-install-recommends vim ca-certificates procps
-RUN apt-get clean
-RUN mkdir -p /opt/config /opt/storage /opt/log
-
-ENTRYPOINT /bin/bash
diff --git a/base-buster/sources.list b/base-buster/sources.list
deleted file mode 100644
index c316d55..0000000
--- a/base-buster/sources.list
+++ /dev/null
@@ -1,3 +0,0 @@
-deb http://ftp.de.debian.org/debian buster main
-deb http://ftp.de.debian.org/debian buster-updates main
-deb http://security.debian.org/ buster/updates main
diff --git a/base-stretch/Dockerfile b/base-stretch/Dockerfile
deleted file mode 100644
index a829fd4..0000000
--- a/base-stretch/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM docker.io/debian:stretch-slim
-
-COPY sources.list /etc/apt/sources.list
-RUN apt update; apt upgrade --yes
-RUN apt install --yes --no-install-recommends vim ca-certificates procps
-RUN apt-get clean
-RUN mkdir -p /opt/config /opt/storage /opt/log
-
-ENTRYPOINT /bin/bash
diff --git a/base-stretch/sources.list b/base-stretch/sources.list
deleted file mode 100644
index 05e4dd5..0000000
--- a/base-stretch/sources.list
+++ /dev/null
@@ -1,3 +0,0 @@
-deb http://ftp.de.debian.org/debian stretch main
-deb http://ftp.de.debian.org/debian stretch-updates main
-deb http://security.debian.org/ stretch/updates main
\ No newline at end of file
diff --git a/conversejs/Dockerfile b/conversejs/Dockerfile
deleted file mode 100644
index 134da67..0000000
--- a/conversejs/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM node:13-buster AS builder
-
-ARG CONVERSEJS_VERSION=v6.0.1
-ARG LIBSIGNAL_VERSION=v1.2.0
-
-RUN git clone https://github.com/conversejs/converse.js.git /tmp/converse.js && \
-    cd /tmp/converse.js/ && \
-    git checkout $CONVERSEJS_VERSION && \
-    make dist
-
-RUN git clone https://github.com/signalapp/libsignal-protocol-javascript /tmp/libsignal-protocol-javascript && \
-    cd /tmp/libsignal-protocol-javascript && \
-    git checkout $LIBSIGNAL_VERSION
-
-FROM nginx:1.17
-
-COPY --from=builder /tmp/converse.js/dist/ /var/www/
-COPY --from=builder /tmp/converse.js/sounds/ /var/www/sounds/
-COPY --from=builder /tmp/libsignal-protocol-javascript/dist/ /var/www/libsignal-protocol-javascript/
-# workaround for release 6.0.1
-COPY --from=builder /tmp/converse.js/sass/webfonts/ /var/www/webfonts/
-COPY index.default.html /var/www/
-
-RUN rm /etc/nginx/conf.d/*.conf
-COPY site.conf /etc/nginx/conf.d/
-EXPOSE 8080
-
-COPY entrypoint.sh /usr/local/sbin/entrypoint.sh
-ENTRYPOINT ["/usr/local/sbin/entrypoint.sh"]
-CMD ["nginx", "-g", "daemon off;"]
diff --git a/conversejs/README.md b/conversejs/README.md
deleted file mode 100644
index 5388e9c..0000000
--- a/conversejs/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Based on https://github.com/marinai/docker-conversejs
diff --git a/conversejs/entrypoint.sh b/conversejs/entrypoint.sh
deleted file mode 100755
index 548b626..0000000
--- a/conversejs/entrypoint.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash -e
-# Entrypoint for Docker Container
-
-# Check if already present
-if [ -f /var/www/index.html ]; then
-    echo 'Info: index.html already present'
-else
-    echo 'Info: Generating index.html ...'
-
-    cp /var/www/index.default.html /var/www/index.html
-
-    if [ ! -z "$WEBSOCKET_URL" ]; then
-        sed -i "s#websocket_url: undefined#websocket_url: '$WEBSOCKET_URL'#" /var/www/index.html
-    fi
-fi
-
-echo "Running $@ ..."
-exec "$@"
diff --git a/conversejs/index.default.html b/conversejs/index.default.html
deleted file mode 100644
index 02bc8f5..0000000
--- a/conversejs/index.default.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8"/>
-        <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-        <title>Converse.js</title>
-        <link rel="stylesheet" type="text/css" media="screen" href="converse.min.css">
-        <script src="converse.min.js"></script>
-        <script src="libsignal-protocol-javascript/libsignal-protocol.js"></script>
-        <script src="emojis.js"></script>
-    </head>
-    <body class="converse-fullscreen">
-        <div id="conversejs-bg"></div>
-        <script type="text/javascript">
-            converse.initialize({
-                auto_reconnect: true,
-                message_archiving: 'always',
-                omemo_default: true,
-                play_sounds: true,
-                view_mode: 'fullscreen',
-                websocket_url: undefined
-            });
-        </script>
-    </body>
-</html>
diff --git a/conversejs/site.conf b/conversejs/site.conf
deleted file mode 100644
index c518607..0000000
--- a/conversejs/site.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-server {
-    listen       8080;
-    server_name  _;
-
-    location / {
-        root   /var/www;
-        index  index.html;
-    }
-}
diff --git a/karaoke/Dockerfile b/karaoke/Dockerfile
index cc08c0f..09bbaa0 100755
--- a/karaoke/Dockerfile
+++ b/karaoke/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/fsinfuhh/base-bullseye
+FROM debian:bullseye-slim
 
 RUN apt-get -y --no-install-recommends install g++ wget uwsgi uwsgi-plugin-python3 python3 python3-pip python3-six make python3-psycopg2 python3-ldap3 gettext gcc python3-dev libldap2-dev libsasl2-dev libldap-2.4-2 libsasl2-2
 
diff --git a/limesurvey/Dockerfile b/limesurvey/Dockerfile
index e49ba79..a32240f 100644
--- a/limesurvey/Dockerfile
+++ b/limesurvey/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/fsinfuhh/base-bullseye
+FROM debian:bullseye-slim
 
 RUN apt install -y --no-install-recommends \
     wget \
diff --git a/marv/Dockerfile b/marv/Dockerfile
deleted file mode 100644
index 9a4f4ae..0000000
--- a/marv/Dockerfile
+++ /dev/null
@@ -1,42 +0,0 @@
-FROM registry.mafiasi.de/base-stretch
-
-RUN apt update
-RUN usermod -u 2009 -g 33 -d /opt/marv www-data
-
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get -y --no-install-recommends install dirmngr g++ git gnupg lsb-release uwsgi uwsgi-plugin-python libldap2-dev libsasl2-dev libssl-dev virtualenv ffmpeg jq less libcapnp-dev libffi-dev libfreetype6-dev libpng-dev libsasl2-dev libssl-dev libz-dev locales lsof python-cv-bridge python2.7-dev python-opencv python-pip rsync sqlite3 ssh unzip vim
-
-RUN echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list
-RUN apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
-RUN apt update
-RUN apt install -y ros-melodic-ros-base ros-melodic-rosbag ros-melodic-cv-bridge
-
-RUN git clone https://gitlab.com/timonegk/marv-robotics.git /opt/marv
-WORKDIR /opt/marv
-RUN git checkout ldap
-
-RUN pip install wheel; \
-    pip install -r requirements/marv-cli.txt; \
-    pip install -r requirements/marv.txt; \
-    pip install -r requirements/marv-robotics.txt; \
-    pip install marv-ludwig PyYAML PyCrypto gnupg rospkg opencv-python
-
-RUN mkdir -p /opt/marv/sites/cml
-RUN ln -sf /opt/config/marv.conf /opt/marv/sites/cml/marv.conf; \
-    ln -sf /opt/config/uwsgi.conf /opt/marv/sites/cml/uwsgi.conf; \
-    cp -r requirements /requirements
-
-RUN pip install --no-deps code/marv-cli; \
-    pip install --no-deps code/marv;\
-    pip install --no-deps code/marv-robotics
-
-RUN apt -y autoremove; apt clean
-
-COPY run /usr/local/bin/run
-COPY update_db /usr/local/bin/update_db
-COPY uwsgi.ini /etc/uwsgi/marv.ini
-RUN echo 'source /opt/ros/melodic/setup.bash' >> /etc/bash.bashrc
-
-VOLUME /opt/scanroot /opt/config /opt/log
-USER www-data:www-data
-ENTRYPOINT /usr/local/bin/run
diff --git a/marv/run b/marv/run
deleted file mode 100755
index 4a577d4..0000000
--- a/marv/run
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-export USER=www-data HOME=/home/www-data
-export PYTHONPATH=/opt/ros/melodic/lib/python2.7/dist-packages:/opt/marv/venv/lib/python2.7/site-packages
-
-# Actually start the server
-exec uwsgi --ini /etc/uwsgi/marv.ini
diff --git a/marv/update_db b/marv/update_db
deleted file mode 100755
index 402f0e4..0000000
--- a/marv/update_db
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-export USER=www-data HOME=/home/www-data
-source /opt/ros/melodic/setup.bash
-cd /opt/config
-# Scan for new bags
-marv scan
-marv run --collection=bags
-# Remove deleted bags from database
-MISSING_BAGS=$(marv query --missing)
-[[ -n "$MISSING_BAGS"]] && marv discard $MISSING_BAGS
diff --git a/marv/uwsgi.ini b/marv/uwsgi.ini
deleted file mode 100644
index f37859c..0000000
--- a/marv/uwsgi.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[uwsgi]
-socket = :4762
-processes = 8
-threads = 2
-plugins = python
-cron2 = minute=-30,unique=1 /usr/local/bin/update_db
-
-manage-script-name = true
-if-env = MARV_APPLICATION_ROOT
-  mount = $(MARV_APPLICATION_ROOT)=marv.app.wsgi:application
-  env = MARV_APPLICATION_ROOT=$(MARV_APPLICATION_ROOT)
-end-if
-if-not-env = MARV_APPLICATION_ROOT
-  mount = /=marv.app.wsgi:application
-  env = MARV_APPLICATION_ROOT=/
-end-if
-
-;marv.conf next to uwsgi.conf
-env = MARV_CONFIG=/opt/config/marv.conf
-if-env = MARV_INIT
-  env = MARV_INIT=$(MARV_INIT)
-end-if
-
diff --git a/mattermost/Dockerfile b/mattermost/Dockerfile
deleted file mode 100644
index 9714796..0000000
--- a/mattermost/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM registry.mafiasi.de/base-bullseye
-
-ARG VERSION=7.2.0
-
-RUN apt update; \
-    usermod -u 2003 -g nogroup www-data; \
-    apt-get -y --no-install-recommends install wget; \
-    wget -nv https://releases.mattermost.com/$VERSION/mattermost-$VERSION-linux-amd64.tar.gz -O- | tar -C /opt -xz; \
-    sed -i 's/"login.gitlab":"GitLab"/"login.gitlab":"Login"/' /opt/mattermost/client/*.js; \
-    sed -i 's/DIAGNOSTICS_SEGMENT_KEY:"[a-zA-z0-9]*"/DIAGNOSTICS_SEGMENT_KEY:""/' /opt/mattermost/client/*.js; \
-    chown -R www-data:nogroup /opt/mattermost
-
-RUN rmdir /opt/mattermost/logs; \
-    ln -sf /opt/log /opt/mattermost/logs
-
-COPY run /usr/local/bin/run
-EXPOSE 8065
-VOLUME /opt/storage /opt/config /opt/log
-USER www-data:nogroup
-ENTRYPOINT /usr/local/bin/run
diff --git a/mattermost/run b/mattermost/run
deleted file mode 100755
index 906cc83..0000000
--- a/mattermost/run
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-export USER=www-data HOME=/home/www-data
-cd /opt/mattermost
-# This is a little bit hacky since mattermost requires write permissions to
-# the configuration file on updates. But mounted k8s secrets are read-only,
-# therefore we have to copy the file to the configuration folder instead of
-# linking it. To not get the files too much out of sync, we should save the
-# modified configuration file to the ansible repository every now and then.
-cp /opt/config/config.json /opt/mattermost/config/config.json
-chmod 666 /opt/mattermost/config/config.json
-exec /opt/mattermost/bin/mattermost
diff --git a/mumble/Dockerfile b/mumble/Dockerfile
deleted file mode 100644
index 880daa7..0000000
--- a/mumble/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM debian:buster-slim
-
-RUN apt update && apt install -y mumble-server wget python2 python-ldap python-zeroc-ice zeroc-ice-slice libqt5sql5-psql
-WORKDIR /app
-RUN wget https://raw.githubusercontent.com/mumble-voip/mumble-scripts/master/Authenticators/LDAP/LDAPauth.py
-
-COPY run /usr/local/bin/run
-CMD /usr/local/bin/run
diff --git a/mumble/run b/mumble/run
deleted file mode 100755
index b3e2ae9..0000000
--- a/mumble/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-murmurd -ini /app/config/mumble-server.ini
-python2 /app/LDAPauth.py -i /app/config/LDAPauth.ini -a
diff --git a/pizza b/pizza
deleted file mode 160000
index 5ef2fee..0000000
--- a/pizza
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5ef2fee64e7b61421926052cd3f89a9bc8484ddb
diff --git a/sogo/Dockerfile b/sogo/Dockerfile
index 56a7f90..b4fc7d7 100644
--- a/sogo/Dockerfile
+++ b/sogo/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/fsinfuhh/base-bullseye
+FROM debian:bullseye-slim
 
 ENV UID=2007
 ENV VERSION=5.8.2