diff --git a/.gitea/workflows/fail-docker.yaml b/.gitea/workflows/fail-docker.yaml
new file mode 100644
index 00000000..af88e9bb
--- /dev/null
+++ b/.gitea/workflows/fail-docker.yaml
@@ -0,0 +1,57 @@
+name: Build FAIL* Docker Images
+
+on:
+  push:
+    branches: [master]
+    # paths:
+    #   - ".gitea/workflows/fail-docker.yaml"
+    #   - "fail-base.dockerfile"
+    #   - "fail-demo.dockerfile"
+    #   - "fail-generic-tracing.dockerfile"
+
+jobs:
+  fail-base-docker:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Login to container registry
+        uses: docker/login-action@v3
+        with:
+          registry: gitea.vps.chriphost.de
+          username: ${{ secrets.CONTAINER_REGISTRY_USER }}
+          password: ${{ secrets.CONTAINER_REGISTRY_TOKEN }}
+      - name: Build FAIL* Base Docker Image
+        run: docker build --file fail-base.dockerfile --tag gitea.vps.chriphost.de/christoph/fail-base:latest .
+      - name: Push FAIL* Base Docker Image
+        run: docker push gitea.vps.chriphost.de/christoph/fail-base:latest
+  fail-generic-tracing-docker:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Login to container registry
+        uses: docker/login-action@v3
+        with:
+          registry: gitea.vps.chriphost.de
+          username: ${{ secrets.CONTAINER_REGISTRY_USER }}
+          password: ${{ secrets.CONTAINER_REGISTRY_TOKEN }}
+      - name: Build FAIL* Generic Tracing Docker Image
+        run: docker build --file fail-generic-tracing.dockerfile --tag gitea.vps.chriphost.de/christoph/fail-generic-tracing:latest .
+      - name: Push FAIL* Generic Tracing Docker Image
+        run: docker push gitea.vps.chriphost.de/christoph/fail-generic-tracing:latest
+  fail-demo-docker:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Login to container registry
+        uses: docker/login-action@v3
+        with:
+          registry: gitea.vps.chriphost.de
+          username: ${{ secrets.CONTAINER_REGISTRY_USER }}
+          password: ${{ secrets.CONTAINER_REGISTRY_TOKEN }}
+      - name: Build FAIL* Demo Docker Image
+        run: docker build --file fail-demo.dockerfile --tag gitea.vps.chriphost.de/christoph/fail-demo:latest .
+      - name: Push FAIL* Demo Docker Image
+        run: docker push gitea.vps.chriphost.de/christoph/fail-demo:latest
diff --git a/fail-demo.dockerfile b/fail-demo.dockerfile
index 2bbe8774..f01393a7 100644
--- a/fail-demo.dockerfile
+++ b/fail-demo.dockerfile
@@ -3,7 +3,7 @@
 # generic-tracing experiment was already built and the binaries are in
 # place (~fail/bin/*)
 
-FROM fail-generic-tracing
+FROM gitea.vps.chriphost.de/christoph/fail-generic-tracing:latest
 
 LABEL org.opencontainers.image.authors="Christian Dietrich <stettberger@dokucode.de>"
 
diff --git a/fail-generic-tracing.dockerfile b/fail-generic-tracing.dockerfile
index a996d44e..9511fa14 100644
--- a/fail-generic-tracing.dockerfile
+++ b/fail-generic-tracing.dockerfile
@@ -1,6 +1,6 @@
 # Inherit from docker container that has the fail source code prepared,
 # including all tools which are needed to build FAIL*
-FROM fail-base
+FROM gitea.vps.chriphost.de/christoph/fail-base:latest
 
 LABEL org.opencontainers.image.authors="Christian Dietrich <stettberger@dokucode.de>"