diff --git a/.github/workflows/dockerize_dev.yml b/.github/workflows/dockerize_dev.yml
index 1d037ce7..288fdb8a 100644
--- a/.github/workflows/dockerize_dev.yml
+++ b/.github/workflows/dockerize_dev.yml
@@ -38,6 +38,6 @@ jobs:
           file: prod.Dockerfile
           platforms: linux/amd64
           push: true
-          tags: ghcr.io/${{ github.repository }}:${{ env.DOCKER_IMAGE_TAG }}
+          tags: ghcr.io/${{ github.repository }}-cloud:${{ env.DOCKER_IMAGE_TAG }}
           build-args: |
             PORT=42110
diff --git a/.github/workflows/dockerize_production.yml b/.github/workflows/dockerize_production.yml
index 2be5e5cb..2e1eea4b 100644
--- a/.github/workflows/dockerize_production.yml
+++ b/.github/workflows/dockerize_production.yml
@@ -15,7 +15,7 @@ on:
   workflow_dispatch:
 
 env:
-  DOCKER_IMAGE_TAG: 'prod'
+  DOCKER_IMAGE_TAG: ${{ github.ref == 'refs/heads/master' && 'latest' || github.ref_name }}
 
 jobs:
   build:
@@ -42,6 +42,6 @@ jobs:
           file: prod.Dockerfile
           platforms: linux/amd64
           push: true
-          tags: ghcr.io/${{ github.repository }}:${{ env.DOCKER_IMAGE_TAG }}
+          tags: ghcr.io/${{ github.repository }}-cloud:${{ env.DOCKER_IMAGE_TAG }}
           build-args: |
             PORT=42110