diff --git a/.gitea/workflows/build-and-release.yaml b/.gitea/workflows/build-and-release.yaml
index d6f074f..39d2657 100644
--- a/.gitea/workflows/build-and-release.yaml
+++ b/.gitea/workflows/build-and-release.yaml
@@ -21,7 +21,7 @@ on:
         default: ''
 
 env:
-  IMAGE_NAME: bastillion
+  IMAGE_NAME: bastillion-docker
   UPSTREAM_REPO: Loophole-LLC/Bastillion
 
 jobs:
@@ -105,12 +105,11 @@ jobs:
             BASTILLION_VERSION=${{ steps.version_check.outputs.version }}
           tags: |
             ${{ steps.version_check.outputs.registry }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:latest
-            ${{ steps.version_check.outputs.registry }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ steps.version_check.outputs.version }}
             ${{ steps.version_check.outputs.registry }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ steps.version_check.outputs.tag }}
           labels: |
-            org.opencontainers.image.title=Bastillion
+            org.opencontainers.image.title=bastillion-docker
             org.opencontainers.image.description=Modern web-based SSH console and key management tool
-            org.opencontainers.image.version=${{ steps.version_check.outputs.version }}
+            org.opencontainers.image.version=${{ steps.version_check.outputs.tag }}
             org.opencontainers.image.source=${{ github.server_url }}/${{ github.repository }}
 
       - name: Create Git Tag and Release
diff --git a/README.md b/README.md
index b3f625d..bdbbc69 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ docker run -d \
   -e PORT=8080 \
   -e TLS_ENABLED=false \
   -e GEN_DB_PASS=true \
-  bastillion:latest
+  bastillion-docker:latest
 ```
 
 ### Mit Docker Compose (inkl. Traefik)
@@ -45,7 +45,7 @@ version: "3.8"
 
 services:
   bastillion:
-    image: bastillion:latest
+    image: bastillion-docker:latest
     container_name: bastillion
     hostname: bastillion
     restart: unless-stopped
diff --git a/docker-compose.yaml b/docker-compose.yaml
index f735302..eefca94 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   bastillion:
-    image: bastillion:latest
+    image: bastillion-docker:latest
     container_name: bastillion
     hostname: bastillion
     restart: unless-stopped