diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 46c42f1a..61cef035 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -103,7 +103,7 @@ jobs:
           aws s3 sync dist s3://builds.loraserver.io/chirpstack
         if: startsWith(github.ref, 'refs/tags/v')
       -
-        name: Docker meta
+        name: Docker meta (PostgreSQL)
         id: meta
         uses: docker/metadata-action@v3
         with:
@@ -113,6 +113,19 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}
             type=semver,pattern={{major}}.{{minor}}
+        if: matrix.database == 'postgres'
+      -
+        name: Docker meta (other)
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: |
+            chirpstack/${{ github.event.repository.name }}-${{ matrix.database }}
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}
+            type=semver,pattern={{major}}.{{minor}}
+        if: matrix.database != 'postgres'
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1