diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d6219223..25f3f19b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,20 +1,17 @@
-name: Publish Docker ALPHA Image
+name: Publish Docker Image
 
 on:
-  workflow_dispatch:
   push:
-    tags:
-      - "*"
-    branches:
-      - main
   pull_request:
-    branches:
-      - main
 
 jobs:
   docker:
     runs-on: ubuntu-latest
+    if: github.ref_name != 'main'
     steps:
+      - name: Get current date
+          id: date
+          run: echo "::set-output name=date::$(date +'%Y%m%d')"
       - name: Checkout
         uses: actions/checkout@v3
 
@@ -34,6 +31,7 @@ jobs:
           file: Dockerfile
           push: true
           tags: |
-            fvergaracl/game:alpha
-            fvergaracl/game:alpha-${{ github.run_number }}
+            fvergaracl/game:latest
+            fvergaracl/game:${{ github.ref_name }}
+            fvergaracl/game:${{ github.ref_name }}.${{ steps.date.outputs.date }}
           target: prod
diff --git a/.github/workflows/docker_alpha.yml b/.github/workflows/docker_alpha.yml
index 06e8b51b..dae7b010 100644
--- a/.github/workflows/docker_alpha.yml
+++ b/.github/workflows/docker_alpha.yml
@@ -14,8 +14,11 @@ on:
 jobs:
   docker:
     runs-on: ubuntu-latest
-    if: github.ref_name != 'main'
     steps:
+      - name: Get current date
+        id: date
+        run: echo "::set-output name=date::$(date +'%Y%m%d')"
+
       - name: Checkout
         uses: actions/checkout@v3
 
@@ -35,6 +38,5 @@ jobs:
           file: Dockerfile
           push: true
           tags: |
-            fvergaracl/game:latest
-            fvergaracl/game:${{ github.ref_name }}
-            fvergaracl/game:${{ github.ref_name }}-${{ github.run_number }}
+            fvergaracl/game:alpha
+            fvergaracl/game:alpha.${{ steps.date.outputs.date }}