diff --git a/.github/workflows/build-docker-admin-api.yml b/.github/workflows/build-docker-admin-api.yml
deleted file mode 100644
index 955e29cf8..000000000
--- a/.github/workflows/build-docker-admin-api.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Build admin api docker image
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - "extra/admin-api/Spacebar.AdminApi/**"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - uses: actions/checkout@v6
-      - uses: cachix/install-nix-action@v31
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - name: Build the docker image
-        run: nix build .#containers.x86_64-linux.docker.admin-api
-      - run: docker load < result
-      - name: downcase REPO
-        run: echo "REPO=${GITHUB_REPOSITORY,,}" >>$GITHUB_ENV
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Tag and push the image
-        run: |
-         IMAGE_ID=$(docker images spacebar-server-ts-admin-api --format '{{.ID}}')
-         docker tag $IMAGE_ID ghcr.io/$REPO-admin-api
-         docker push ghcr.io/$REPO-admin-api
diff --git a/.github/workflows/build-docker-api.yml b/.github/workflows/build-docker-api.yml
deleted file mode 100644
index 9f9714193..000000000
--- a/.github/workflows/build-docker-api.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: Build api docker image
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - "src/api/**"
-      - "src/schemas/**"
-      - "src/util/**"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - uses: actions/checkout@v6
-      - uses: cachix/install-nix-action@v31
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - name: Build the docker image
-        run: nix build .#containers.x86_64-linux.docker.api
-      - run: docker load < result
-      - name: downcase REPO
-        run: echo "REPO=${GITHUB_REPOSITORY,,}" >>$GITHUB_ENV
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Tag and push the image
-        run: |
-         IMAGE_ID=$(docker images spacebar-server-ts-api --format '{{.ID}}')
-         docker tag $IMAGE_ID ghcr.io/$REPO-api
-         docker push ghcr.io/$REPO-api
diff --git a/.github/workflows/build-docker-bundle.yml b/.github/workflows/build-docker-bundle.yml
deleted file mode 100644
index b102ab4ee..000000000
--- a/.github/workflows/build-docker-bundle.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Build bundle docker image
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - "src/**"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - uses: actions/checkout@v6
-      - uses: cachix/install-nix-action@v31
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - name: Build the docker image
-        run: nix build .#containers.x86_64-linux.docker.default
-      - run: docker load < result
-      - name: downcase REPO
-        run: echo "REPO=${GITHUB_REPOSITORY,,}" >>$GITHUB_ENV
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Tag and push the image
-        run: |
-         IMAGE_ID=$(docker images spacebar-server-ts --format '{{.ID}}')
-         docker tag $IMAGE_ID ghcr.io/$REPO
-         docker push ghcr.io/$REPO
diff --git a/.github/workflows/build-docker-cdn-cs.yml b/.github/workflows/build-docker-cdn-cs.yml
deleted file mode 100644
index 18e2a1af9..000000000
--- a/.github/workflows/build-docker-cdn-cs.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Build cdn cs docker image
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - "extra/admin-api/Spacebar.Cdn/**"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - uses: actions/checkout@v6
-      - uses: cachix/install-nix-action@v31
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - name: Build the docker image
-        run: nix build .#containers.x86_64-linux.docker.cdn-cs
-      - run: docker load < result
-      - name: downcase REPO
-        run: echo "REPO=${GITHUB_REPOSITORY,,}" >>$GITHUB_ENV
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Tag and push the image
-        run: |
-         IMAGE_ID=$(docker images spacebar-server-ts-cdn-cs --format '{{.ID}}')
-         docker tag $IMAGE_ID ghcr.io/$REPO-cdn-cs
-         docker push ghcr.io/$REPO-cdn-cs
diff --git a/.github/workflows/build-docker-cdn.yml b/.github/workflows/build-docker-cdn.yml
deleted file mode 100644
index c79d9a37d..000000000
--- a/.github/workflows/build-docker-cdn.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: Build cdn docker image
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - "src/cdn/**"
-      - "src/schemas/**"
-      - "src/util/**"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - uses: actions/checkout@v6
-      - uses: cachix/install-nix-action@v31
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - name: Build the docker image
-        run: nix build .#containers.x86_64-linux.docker.cdn
-      - run: docker load < result
-      - name: downcase REPO
-        run: echo "REPO=${GITHUB_REPOSITORY,,}" >>$GITHUB_ENV
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Tag and push the image
-        run: |
-         IMAGE_ID=$(docker images spacebar-server-ts-cdn --format '{{.ID}}')
-         docker tag $IMAGE_ID ghcr.io/$REPO-cdn
-         docker push ghcr.io/$REPO-cdn
diff --git a/.github/workflows/build-docker-gateway-offload.yml b/.github/workflows/build-docker-gateway-offload.yml
deleted file mode 100644
index f6c6c71e0..000000000
--- a/.github/workflows/build-docker-gateway-offload.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Build gateway offload docker image
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - "extra/admin-api/Spacebar.GatewayOffload/**"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - uses: actions/checkout@v6
-      - uses: cachix/install-nix-action@v31
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - name: Build the docker image
-        run: nix build .#containers.x86_64-linux.docker.gateway-offload
-      - run: docker load < result
-      - name: downcase REPO
-        run: echo "REPO=${GITHUB_REPOSITORY,,}" >>$GITHUB_ENV
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Tag and push the image
-        run: |
-         IMAGE_ID=$(docker images spacebar-server-ts-gateway-offload --format '{{.ID}}')
-         docker tag $IMAGE_ID ghcr.io/$REPO-gateway-offload
-         docker push ghcr.io/$REPO-gateway-offload
diff --git a/.github/workflows/build-docker-gateway.yml b/.github/workflows/build-docker-gateway.yml
deleted file mode 100644
index fc5ac8b26..000000000
--- a/.github/workflows/build-docker-gateway.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: Build gateway docker image
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - "src/gateway/**"
-      - "src/schemas/**"
-      - "src/util/**"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - uses: actions/checkout@v6
-      - uses: cachix/install-nix-action@v31
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - name: Build the docker image
-        run: nix build .#containers.x86_64-linux.docker.gateway
-      - run: docker load < result
-      - name: downcase REPO
-        run: echo "REPO=${GITHUB_REPOSITORY,,}" >>$GITHUB_ENV
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Tag and push the image
-        run: |
-         IMAGE_ID=$(docker images spacebar-server-ts-gateway --format '{{.ID}}')
-         docker tag $IMAGE_ID ghcr.io/$REPO-gateway
-         docker push ghcr.io/$REPO-gateway
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
new file mode 100644
index 000000000..e4eae70af
--- /dev/null
+++ b/.github/workflows/build-docker.yml
@@ -0,0 +1,53 @@
+name: Build docker images
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      matrix:
+        package:
+          - default
+          - cdn
+          - api
+          - gateway
+          - admin-api
+          - cdn-cs
+          - gateway-offload
+    steps:
+      - uses: actions/checkout@v6
+      - uses: cachix/install-nix-action@v31
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - name: Build the docker image
+        run: nix build .#containers.x86_64-linux.docker.${{ matrix.package }}
+        working-directory: server
+      - run: docker load < result
+        working-directory: server
+      - name: downcase REPO
+        run: echo "REPO=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Compute image suffix
+        run: |
+         if [ "${{ matrix.package }}" = "default" ]; then
+         echo "SUFFIX=" >> $GITHUB_ENV
+         else
+         echo "SUFFIX=-${{ matrix.package }}" >> $GITHUB_ENV
+         fi
+      - name: Tag and push the image
+        run: |
+         IMAGE_ID=$(docker images spacebar-server-ts$SUFFIX --format '{{.ID}}')
+         docker tag $IMAGE_ID ghcr.io/$REPO$SUFFIX:latest
+         docker push ghcr.io/$REPO$SUFFIX:latest