diff --git a/.gitea/workflows/build_publish-artifact.yml b/.gitea/workflows/build_publish-artifact.yml
index 4471fc5..4cf0a3a 100644
--- a/.gitea/workflows/build_publish-artifact.yml
+++ b/.gitea/workflows/build_publish-artifact.yml
@@ -62,14 +62,27 @@ jobs:
     needs: [check, quality-gate]
     if: needs.check.outputs.artifact_exists == 'false'
     runs-on: ubuntu-latest
+    services:
+      docker:
+        image: docker:dind
+        env:
+          DOCKER_TLS_CERTDIR: ""
+    env:
+      DOCKER_HOST: tcp://docker:2375
     steps:
       - uses: actions/checkout@v4
 
       - name: Build container
         run: |
-          docker build -t "minimal:${{ needs.check.outputs.version }}" .
+          VERSION="${{ needs.check.outputs.version }}"
+          NOW=$(date -u +%Y-%m-%dT%H:%M:%SZ)
+          docker build \
+            --label "git.commit=${GITHUB_SHA:0:8}" \
+            --label "git.commitBy=${GITHUB_ACTOR}" \
+            --label "build.date=${NOW}" \
+            -t "minimal:${VERSION}" .
           mkdir -p /tmp/image
-          docker save "minimal:${{ needs.check.outputs.version }}" -o /tmp/image/artifact.tar
+          docker save "minimal:${VERSION}" -o /tmp/image/artifact.tar
 
       - name: Save Docker image for next job
         uses: actions/upload-artifact@v4
@@ -80,6 +93,13 @@ jobs:
   push:
     needs: [check, build]
     runs-on: ubuntu-latest
+    services:
+      docker:
+        image: docker:dind
+        env:
+          DOCKER_TLS_CERTDIR: ""
+    env:
+      DOCKER_HOST: tcp://docker:2375
     steps:
       - name: Load saved Docker image
         uses: actions/download-artifact@v4
diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index 449892a..972d5d8 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -11,22 +11,22 @@ jobs:
     with:
       config_path: .gitea/workflows/gitea-env.conf
 
-  feature:
-    name: Quality Gate
-    if: github.ref != 'refs/heads/main'
-    needs: [load-config]
-    uses: niko/gitea-ci-library/.gitea/workflows/quality-gate.yml@main
-    secrets: inherit
-    with:
-      env_json: ${{ needs.load-config.outputs.env_json }}
-      bats-image: bats/bats:latest
-      cucumber-node-image: node:22
+  # feature:
+  #   name: Quality Gate
+  #   if: github.ref != 'refs/heads/main'
+  #   needs: [load-config]
+  #   uses: niko/gitea-ci-library/.gitea/workflows/quality-gate.yml@main
+  #   secrets: inherit
+  #   with:
+  #     env_json: ${{ needs.load-config.outputs.env_json }}
+  #     bats-image: bats/bats:latest
+  #     cucumber-node-image: node:22
 
   main:
     name: Build & Push Artifact
-    if: github.ref == 'refs/heads/main'
+    # if: github.ref == 'refs/heads/main'  # FIXME: väliaikainen — ajetaan tässä haarassa
     needs: [load-config]
-    uses: niko/gitea-ci-library/.gitea/workflows/build_publish-artifact.yml@main
+    uses: niko/gitea-ci-library/.gitea/workflows/build_publish-artifact.yml@feature/docker-kuntoon
     secrets: inherit
     with:
       env_json: ${{ needs.load-config.outputs.env_json }}