diff --git a/.github/workflows/doktainer-image.yml b/.github/workflows/doktainer-image.yml
index e437418..47b6841 100644
--- a/.github/workflows/doktainer-image.yml
+++ b/.github/workflows/doktainer-image.yml
@@ -83,6 +83,17 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Generate tags
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ secrets.DOCKERHUB_USERNAME }}/doktainer
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' }}
+            type=sha,prefix=,suffix=,format=short
+
       - name: Extract image metadata
         id: meta
         uses: docker/metadata-action@v5
diff --git a/src/server/index.ts b/src/server/index.ts
index d3426cd..20050d6 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -146,7 +146,7 @@ async function start() {
     status: "ok",
     uptime: process.uptime(),
     timestamp: new Date().toISOString(),
-    version: process.env.APP_PUBLIC_VERSION || "unknown",
+    version: process.env.NEXT_PUBLIC_VERSION || "unknown",
   }));
 
   // ── API Routes ────────────────────────────────────────