diff --git a/.github/workflows/cd/docker-compose.yml b/.github/workflows/cd/docker-compose.yml
index 06bcca29..bc4565f0 100644
--- a/.github/workflows/cd/docker-compose.yml
+++ b/.github/workflows/cd/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.9"
 
 x-params:
   &default-params
-  image: ghcr.io/giongto35/cloud-game/cloud-game:${IMAGE_TAG:-dev}
+  image: ghcr.io/giongto35/cloud-game/cloud-game:${IMAGE_TAG:-master}
   network_mode: "host"
   privileged: true
   restart: always
diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml
new file mode 100644
index 00000000..b967d415
--- /dev/null
+++ b/.github/workflows/docker_publish.yml
@@ -0,0 +1,48 @@
+# ----------------------------------------------------------------------------------
+#  Publish Docker image from the current master branch or v* into Github repository
+# ----------------------------------------------------------------------------------
+
+name: docker-publish
+
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - 'v*'
+
+jobs:
+  docker-publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - run: echo "V=$(./scripts/version.sh)" >> $GITHUB_ENV
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ghcr.io/${{ github.repository }}/cloud-game
+          tags: |
+            type=ref,event=branch
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+      - uses: docker/setup-buildx-action@v2
+      - uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - uses: docker/build-push-action@v4
+        with:
+          build_args: VERSION=${{ env.V }}
+          context: .
+          push: true
+          provenance: false
+          sbom: false
+          tags: |
+            ${{ steps.meta.outputs.tags }}
+          labels: |
+            ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
diff --git a/.github/workflows/docker_publish_stable.yml b/.github/workflows/docker_publish_stable.yml
deleted file mode 100644
index e06facac..00000000
--- a/.github/workflows/docker_publish_stable.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-# ------------------------------------------------------------------------
-#  Publish Docker image from the stable snapshot into Github repository
-# ------------------------------------------------------------------------
-
-name: publish-stable
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  docker-publish-stable:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - run: echo "TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
-
-      - run: echo "V=$(./scripts/version.sh)" >> $GITHUB_ENV
-
-      - uses: docker/build-push-action@v1
-        with:
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          add_git_labels: true
-          tags: latest,${{ env.TAG }}
-          build_args: VERSION=${{ env.V }}
-
-          registry: docker.pkg.github.com
-          repository: ${{ github.REPOSITORY }}/cloud-game
diff --git a/.github/workflows/docker_publish_unstable.yml b/.github/workflows/docker_publish_unstable.yml
deleted file mode 100644
index 9b81b188..00000000
--- a/.github/workflows/docker_publish_unstable.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-# ----------------------------------------------------------------------------
-#  Publish Docker image from the current master branch into Github repository
-# ----------------------------------------------------------------------------
-
-name: publish-unstable
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  docker-publish-unstable:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - run: echo "V=$(./scripts/version.sh)" >> $GITHUB_ENV
-
-      - uses: docker/build-push-action@v1
-        with:
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          add_git_labels: true
-          tags: dev
-          build_args: VERSION=${{ env.V }}
-
-          registry: docker.pkg.github.com
-          repository: ${{ github.REPOSITORY }}/cloud-game