diff --git a/.github/workflows/build_containers.yml b/.github/workflows/build_containers.yml
new file mode 100644
index 0000000..1d1678c
--- /dev/null
+++ b/.github/workflows/build_containers.yml
@@ -0,0 +1,23 @@
+name: build_containers
+
+on:
+  push:
+    branches: [ master ]
+  schedule:
+    - cron: "0 3 * * 1"   # every monday at a 3am
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  build_container:
+    strategy:
+      fail-fast: false
+      matrix:
+        container:
+          - base-bullseye
+    uses: ./.github/workflows/build_single_container.yml
+    with:
+      container: "${{ matrix.container }}"
+    secrets: inherit
diff --git a/.github/workflows/build_single_container.yml b/.github/workflows/build_single_container.yml
new file mode 100644
index 0000000..d36dc47
--- /dev/null
+++ b/.github/workflows/build_single_container.yml
@@ -0,0 +1,26 @@
+name: build_single_container
+on:
+  workflow_dispatch:
+    inputs:
+      container:
+        description: "Which container to build"
+        type: string
+        required: true
+  workflow_call:
+    inputs:
+      container:
+        description: "Which container to build"
+        required: true
+        type: string
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  build_container:
+    name: "Build ${{ inputs.container }}"
+    uses: fsinfuhh/workflows/.github/workflows/build_image.yml@main
+    with:
+      image_base_name: "${{ inputs.container }}"
+    secrets: inherit
diff --git a/MafiAStarLite/MafiAStarLite b/MafiAStarLite/MafiAStarLite
deleted file mode 160000
index 4421e6a..0000000
--- a/MafiAStarLite/MafiAStarLite
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4421e6aa21cbc5237f706874d76404d075a7cdb3
diff --git a/MafiAStarLite/MafiAStarLite-frontend b/MafiAStarLite/MafiAStarLite-frontend
deleted file mode 160000
index a916f0a..0000000
--- a/MafiAStarLite/MafiAStarLite-frontend
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a916f0afb3b5b1cf2093db0d433fd9ed8e303c84