diff --git a/.forgejo/workflows/lint-and-build.yml b/.forgejo/workflows/lint-and-build.yml
index 1bb9342..def7bc7 100644
--- a/.forgejo/workflows/lint-and-build.yml
+++ b/.forgejo/workflows/lint-and-build.yml
@@ -80,3 +80,38 @@ jobs:
       - name: Restore integration tests
         working-directory: ./backend
         run: mv tests.disabled tests
+
+  docker-build:
+    runs-on: docker
+    container:
+      image: docker:latest
+    services:
+      docker-in-docker:
+        image: docker:dind
+        env:
+          DOCKER_TLS_CERTDIR: ""
+    env:
+      DOCKER_HOST: tcp://docker-in-docker:2375
+      DOCKER_TLS_CERTDIR: ""
+      DOCKER_DRIVER: overlay2
+    needs: build
+    
+    steps:
+      - name: Install Node.js
+        run: |
+          apk add --no-cache nodejs npm
+
+      - uses: https://github.com/actions/checkout@v4
+
+      - name: Verify Docker connection
+        run: docker info
+
+      - name: Build backend Docker image
+        run: |
+          cd backend
+          docker build -t normogen-backend:latest .
+
+      - name: Build frontend Docker image
+        run: |
+          cd frontend
+          docker build -t normogen-frontend:latest .