diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
new file mode 100644
index 0000000..a2638c0
--- /dev/null
+++ b/.gitea/workflows/deploy.yaml
@@ -0,0 +1,37 @@
+name: Docker Build and Push
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - 'main'
+    tags:
+      - '*'
+  release:
+    types: [ published ]
+
+env:
+  GOMPLATE_VERSION: 5.1.0
+  GITEA_CONTAINER_REG: gitea.nerthus.nl
+  DOCKER_IMAGE_NAME: orbits-server
+
+jobs:
+  docker_build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      fail-fast: false
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Install dependencies
+        run: |
+          curl -L -o /usr/local/bin/gomplate https://github.com/hairyhenderson/gomplate/releases/download/v{{ env.GOMPLATE_VERSION }}/gomplate_linux-amd64
+          chmod +x /usr/bin/gomplate
+
+      - name: Render template
+        run: |
+          gomplate
diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml
index 397a8d2..b6263c5 100644
--- a/.gitea/workflows/docker.yaml
+++ b/.gitea/workflows/docker.yaml
@@ -23,12 +23,6 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - name: Prepare for rootless docker
-        run: |
-          ls -l /run/docker.sock || true
-          ss -lx | grep docker || true
-          ps aux | grep dockerd || true
-
       - name: Checkout repository
         uses: actions/checkout@v6