diff --git a/Dockerfile b/Dockerfile
index 73cbc7641857bac5ea26919bd4254cc83bd670a9..c9cb25ee0e3ad84b3d71582d584ee875958d4ff2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim AS build
+FROM debian:stable-slim AS build
 ADD . /src
 WORKDIR /src
 RUN apt-get -q update && \
@@ -9,7 +9,7 @@ RUN apt-get -q update && \
     rm -fr /var/lib/apt/lists/* && \
     python3 setup.py bdist_wheel
 
-FROM registry.git.autistici.org/ai3/docker/s6-base:master
+FROM registry.git.autistici.org/ai3/docker/s6-overlay-lite:master
 COPY --from=build /src/dist/*.whl /tmp/wheels/
 COPY conf/ /etc/
 COPY feedbackloop.sh /usr/local/bin/feedbackloop
diff --git a/Dockerfile.multistage b/Dockerfile.multistage
deleted file mode 100644
index 352b5f5e5e13abda69ef7f7b87204dc8d26642ae..0000000000000000000000000000000000000000
--- a/Dockerfile.multistage
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM registry.git.autistici.org/ai3/docker/s6-base:master AS fbl-base
-RUN apt-get -q update && \
-    env DEBIAN_FRONTEND=noninteractive apt-get -qy install --no-install-recommends \
-        python3-flask python3-sqlalchemy python3-flask-sqlalchemy python3-cheroot \
-        python3-setuptools python3-pip && \
-    apt-get clean && \
-    rm -fr /var/lib/apt/lists/*
-
-FROM fbl-base AS build
-ADD . /src
-WORKDIR /src
-RUN python3 setup.py bdist_wheel
-
-FROM fbl-base
-COPY --from=build /src/dist/*.whl /tmp/wheels/
-COPY conf/ /etc/
-COPY feedbackloop.sh /usr/local/bin/feedbackloop
-RUN cd /tmp/wheels && pip3 install *.whl && rm -fr /tmp/wheels
diff --git a/conf/services.d/feedbackloop/finish b/conf/services.d/feedbackloop/finish
index b6531b3ca574205c9e78650dbd7c38718683e57c..8f66da993f1d8bf3986e1d264283f3ec178ca21e 100755
--- a/conf/services.d/feedbackloop/finish
+++ b/conf/services.d/feedbackloop/finish
@@ -1,3 +1,2 @@
-#!/usr/bin/execlineb -S0
-
-s6-svscanctl -t /var/run/s6/services
+#!/bin/sh
+s6-svscanctl -t /run/s6/service