diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
new file mode 100644
index 000000000..3ba03e668
--- /dev/null
+++ b/.github/workflows/build-images.yml
@@ -0,0 +1,89 @@
+# SPDX-FileCopyrightText: LXCat team
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+name: Create and publish Docker images to use in production
+
+on:
+  release:
+    types: [published]
+  pull_request:
+    branches:
+      - main
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
+
+env:
+  REGISTRY: ghcr.io
+
+permissions:
+  contents: read
+  packages: write
+  attestations: write
+  id-token: write
+
+jobs:
+  build-and-push-admin:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Log in to the container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        id: push
+        uses: docker/build-push-action@v6
+        with:
+          image: lxcat-project/admin-cli
+          tags: ${{ github.ref_name }}, latest
+          registry: ${{ env.REGISTRY }}
+          dockerfile: packages/database/Dockerfile
+          push: true
+
+      - name: Generate artifact attestation
+        uses: actions/attest-build-provenance@v1
+        with:
+          subject-name: ${{ env.REGISTRY }}/lxcat-app/admin-cli
+          subject-digest: ${{ steps.push.outputs.digest }}
+          push-to-registry: true
+
+  build-and-push-app:
+     runs-on: ubuntu-latest
+
+     steps:
+       - name: Checkout repository
+         uses: actions/checkout@v4
+
+       - name: Log in to the container registry
+         uses: docker/login-action@v3
+         with:
+           registry: ${{ env.REGISTRY }}
+           username: ${{ github.actor }}
+           password: ${{ secrets.GITHUB_TOKEN }}
+
+       - name: Build and push Docker image
+         id: push
+         uses: docker/build-push-action@v6
+         with:
+           image: lxcat-project/app
+           tags: ${{ github.ref_name }}, latest
+           registry: ${{ env.REGISTRY }}
+           dockerfile: app/Dockerfile
+           push: true
+
+       - name: Generate artifact attestation
+         uses: actions/attest-build-provenance@v1
+         with:
+           subject-name: ${{ env.REGISTRY }}/lxcat-project/app
+           subject-digest: ${{ steps.push.outputs.digest }}
+           push-to-registry: true