diff --git a/README.md b/README.md
index d239a46..5e19fc0 100644
--- a/README.md
+++ b/README.md
@@ -79,9 +79,20 @@ This repository is used for building Container images from the source manifests
 
 ### CI
 
-We provide a CI manifest to build and push container images to Docker Hub (`docker.io`) and to the GitHub Container Registry (`ghcr.io`).
+We provide CI manifests to build and push container images to Docker Hub (`docker.io`) and to the GitHub Container Registry (`ghcr.io`).
 
-Find it in [`.github/workflows/build.yml`](.github/workflows/build.yml).
+Find them in [`.github/workflows/`](.github/workflows/).
+
+- `build-and-push.yml`, a generic build and push workflow that is called by other workflows and releases artifacts into Docker Hub and the GitHub Container Registry.
+- `build.default.yml`, builds the `default` context into a `pretalx` image.
+- `build.plugins.yml`, builds the `plugins` context into a `pretalx-extended` image.
+
+The artifacts can be retrieved from:
+
+- [pretalx/pretalx Tags | Docker Hub](https://hub.docker.com/r/pretalx/pretalx/tags)
+- [pretalx/pretalx-extended Tags | Docker Hub](https://hub.docker.com/r/pretalx/pretalx-extended/tags)
+- [pretalx versions · pretalx · GHCR](https://github.com/pretalx/pretalx-docker/pkgs/container/pretalx/versions)
+- [pretalx-extended versions · pretalx · GHCR](https://github.com/pretalx/pretalx-docker/pkgs/container/pretalx-extended/versions)
 
 ### Setting up the build environment
 
diff --git a/compose/build.yml b/compose/build.yml
index 58effe7..e8de409 100644
--- a/compose/build.yml
+++ b/compose/build.yml
@@ -1,6 +1,8 @@
 services:
   app: &build-default
-    build: ./context/default
+    build:
+      context: ./context/default
+      dockerfile: Dockerfile.debian
   worker: *build-default
   cron: *build-default
   migrations: *build-default
diff --git a/compose/plugins.yml b/compose/plugins.yml
index f04178c..f635a34 100644
--- a/compose/plugins.yml
+++ b/compose/plugins.yml
@@ -3,6 +3,7 @@ services:
     image: pretalx-${FQDN}
     build:
       context: ./context/plugins
+      dockerfile: Dockerfile.debian
       args:
         BASE_IMAGE: ${PRETALX_IMAGE}
         BASE_TAG: ${PRETALX_TAG}
diff --git a/context/default/Dockerfile.debian b/context/default/Dockerfile.debian
index 8518cd6..13f46cd 100644
--- a/context/default/Dockerfile.debian
+++ b/context/default/Dockerfile.debian
@@ -12,7 +12,6 @@ RUN apt update && \
                 libpq-dev \
                 locales \
                 libmemcached-dev \
-                build-essential \
                 locales \
                 nodejs \
                 npm \
diff --git a/legacy/docker-compose.yml.example b/legacy/docker-compose.yml.example
index 9e2d324..b9630ec 100644
--- a/legacy/docker-compose.yml.example
+++ b/legacy/docker-compose.yml.example
@@ -44,13 +44,13 @@ services:
 
 
   app:
-#    image: ${PRETALX_IMAGE}:${PRETALX_TAG}
-    image: pretalx-${FQDN}
-    build:
-      context: ./context/plugins
-      args:
-        BASE_IMAGE: ${PRETALX_IMAGE}
-        BASE_TAG: ${PRETALX_TAG}
+    image: ${PRETALX_IMAGE}:${PRETALX_TAG}
+#    image: pretalx-${FQDN}
+#    build:
+#      context: ./context/plugins
+#      args:
+#        BASE_IMAGE: ${PRETALX_IMAGE}
+#        BASE_TAG: ${PRETALX_TAG}
     command: gunicorn
     restart: unless-stopped
 
@@ -83,13 +83,13 @@ services:
       PRETALX_DB_PASS: ${POSTGRES_PASSWORD}
 
   worker:
-#    image: ${PRETALX_IMAGE}:${PRETALX_TAG}
-    image: pretalx-${FQDN}
-    build:
-      context: ./context/plugins
-      args:
-        BASE_IMAGE: ${PRETALX_IMAGE}
-        BASE_TAG: ${PRETALX_TAG}
+    image: ${PRETALX_IMAGE}:${PRETALX_TAG}
+#    image: pretalx-${FQDN}
+#    build:
+#      context: ./context/plugins
+#      args:
+#        BASE_IMAGE: ${PRETALX_IMAGE}
+#        BASE_TAG: ${PRETALX_TAG}
     command: celery
     restart: unless-stopped
 
@@ -122,13 +122,13 @@ services:
       PRETALX_DB_PASS: ${POSTGRES_PASSWORD}
 
   cron:
-#    image: ${PRETALX_IMAGE}:${PRETALX_TAG}
-    image: pretalx-${FQDN}
-    build:
-      context: ./context/plugins
-      args:
-        BASE_IMAGE: ${PRETALX_IMAGE}
-        BASE_TAG: ${PRETALX_TAG}
+    image: ${PRETALX_IMAGE}:${PRETALX_TAG}
+#    image: pretalx-${FQDN}
+#    build:
+#      context: ./context/plugins
+#      args:
+#        BASE_IMAGE: ${PRETALX_IMAGE}
+#        BASE_TAG: ${PRETALX_TAG}
     command: cron
     user: root
     init: true
@@ -159,13 +159,13 @@ services:
       PRETALX_DB_PASS: ${POSTGRES_PASSWORD}
 
   migrations:
-#    image: ${PRETALX_IMAGE}:${PRETALX_TAG}
-    image: pretalx-${FQDN}
-    build:
-      context: ./context/plugins
-      args:
-        BASE_IMAGE: ${PRETALX_IMAGE}
-        BASE_TAG: ${PRETALX_TAG}
+    image: ${PRETALX_IMAGE}:${PRETALX_TAG}
+#    image: pretalx-${FQDN}
+#    build:
+#      context: ./context/plugins
+#      args:
+#        BASE_IMAGE: ${PRETALX_IMAGE}
+#        BASE_TAG: ${PRETALX_TAG}
     command: migrate
     restart: "no"