diff --git a/.github/workflows/publish-kilt-node.yml b/.github/workflows/publish-kilt-node.yml
new file mode 100644
index 0000000000..2113a014ec
--- /dev/null
+++ b/.github/workflows/publish-kilt-node.yml
@@ -0,0 +1,31 @@
+name: Build and Push Docker Image
+
+on:
+  push:
+    branches:
+      - docker-image
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PASS }}
+
+      - name: Build and Push Docker Image
+        uses: docker/build-push-action@v6
+        with:
+          build-args: NODE_TYPE=standalone-node
+          context: .
+          file: Dockerfile
+          platforms: linux/amd64
+          tags: |
+            kiltprotocol/kilt-node:latest-develop
+            kiltprotocol/kilt-node:${{ github.sha }}
diff --git a/.maintain/build-image.sh b/.maintain/build-image.sh
index ad88929b43..15d3745393 100755
--- a/.maintain/build-image.sh
+++ b/.maintain/build-image.sh
@@ -7,10 +7,10 @@ target_tag=$1
 # Build the builder image and push it in the background
 docker build \
     --target builder \
-    --cache-from $AWS_REGISTRY/kilt-parachain/collator:builder \
-    -t $AWS_REGISTRY/kilt-parachain/collator:builder \
+    --cache-from $AWS_REGISTRY/kilt-node:builder \
+    -t $AWS_REGISTRY/kilt-node:builder \
     . &
-docker push $AWS_REGISTRY/kilt-parachain/collator:builder &
+docker push $AWS_REGISTRY/kilt-node:builder &
 
 wait
 
@@ -21,19 +21,19 @@ build_and_tag() {
     local cache_image=$3
 
     docker build \
-        --cache-from $AWS_REGISTRY/kilt-parachain/collator:builder \
+        --cache-from $AWS_REGISTRY/kilt-node:builder \
         --cache-from $AWS_REGISTRY/$cache_image:$target_tag \
         --build-arg NODE_TYPE=$node_type \
         -t local/$image_name:$target_tag \
         .
 }
 
-build_and_tag "kilt-parachain" "kilt-node" "kilt-parachain/collator" &
+build_and_tag "kilt-parachain" "kilt-node" "kilt-node" &
 
-build_and_tag "standalone-node" "standalone-node" "kilt/prototype-chain" &
+build_and_tag "standalone-node" "standalone-node" "standalone-node" &
 
-build_and_tag "dip-provider-node-template" "dip-provider-node-template" "kilt-parachain/collator" &
+build_and_tag "dip-provider-node-template" "dip-provider-node-template" "kilt-node" &
 
-build_and_tag "dip-consumer-node-template" "dip-consumer-node-template" "kilt-parachain/collator" &
+build_and_tag "dip-consumer-node-template" "dip-consumer-node-template" "kilt-node" &
 
 wait
diff --git a/Dockerfile b/Dockerfile
index 5aa1d5fac0..42be144a31 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ RUN cargo build --locked --release --features $FEATURES
 
 # ===== SECOND STAGE ======
 
-FROM docker.io/library/ubuntu:20.04
+FROM docker.io/library/ubuntu:22.04
 LABEL description="This is the 2nd stage: a very small image where we copy the kilt-parachain binary."
 
 ARG NODE_TYPE=kilt-parachain