diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
deleted file mode 100644
index a012e51..0000000
--- a/.github/workflows/docker-image.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: Massa
-
-on:
-  push:
-    tags:
-      - TEST.*
-
-jobs:
-
-  build:
-    runs-on: ubuntu-latest
-
-    env:
-      VERSION: ${{ github.ref_name }}
-
-    steps:
-      - name: Checkout the source code
-        uses: actions/checkout@v2
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          build-args: VERSION=${{ env.VERSION }}
-          platforms: linux/amd64, linux/arm64
-          push: true
-          tags: ${{ github.repository }}:${{ env.VERSION }}, ${{ github.repository }}:latest
diff --git a/.github/workflows/dockerhub-description.yml b/.github/workflows/dockerhub-description.yml
deleted file mode 100644
index c9b60c2..0000000
--- a/.github/workflows/dockerhub-description.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Docker Hub Readme
-
-on:
-  push:
-    branches: [main]
-    paths:
-      - README.md
-      - .github/workflows/dockerhub-description.yml
-
-jobs:
-
-  update-dockerhub:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Docker Hub Description
-        uses: peter-evans/dockerhub-description@v3.1.0
-        env:
-          DOCKERHUB_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKERHUB_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-          DOCKERHUB_REPOSITORY: ${{ github.repository }}
diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
new file mode 100644
index 0000000..68b70cb
--- /dev/null
+++ b/.github/workflows/publish-docker.yml
@@ -0,0 +1,35 @@
+name: Build and Publish Docker Image
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Massa node release version"
+        required: true
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout the source code
+        uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          build-args: VERSION=${{ inputs.version }}
+          platforms: linux/amd64, linux/arm64
+          push: true
+          tags: ${{ github.repository }}:dev
+          # tags: ${{ github.repository }}:\${{ inputs.version }}, ${{ github.repository }}:dev