diff --git a/.github/workflows/foxy-docker-build.yml b/.github/workflows/foxy-docker-build.yml
index 2485214..64f88bc 100644
--- a/.github/workflows/foxy-docker-build.yml
+++ b/.github/workflows/foxy-docker-build.yml
@@ -1,4 +1,4 @@
-name: Foxy Docker Builds
+name: Foxy Docker Build
 
 on: [push, pull_request]
 
@@ -12,15 +12,8 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
           build-args: ROS_DISTRO=foxy
-          push: true
-          tags: mgons/yasmin:foxy
+          push: false
diff --git a/.github/workflows/foxy-docker-push.yml b/.github/workflows/foxy-docker-push.yml
new file mode 100644
index 0000000..e48585f
--- /dev/null
+++ b/.github/workflows/foxy-docker-push.yml
@@ -0,0 +1,32 @@
+name: Foxy Docker Push
+
+on:
+  workflow_run:
+    workflows: ["foxy_docker_build"]
+    types:
+      - completed
+
+jobs:
+  foxy_docker_push:
+    if: ${{ github.event.workflow_run.conclusion == 'success' && github.ref == 'refs/heads/main' }}
+
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          build-args: ROS_DISTRO=foxy
+          push: true
+          tags: mgons/yasmin:foxy
diff --git a/.github/workflows/galactic-docker-build.yml b/.github/workflows/galactic-docker-build.yml
index 97a4e70..ead6071 100644
--- a/.github/workflows/galactic-docker-build.yml
+++ b/.github/workflows/galactic-docker-build.yml
@@ -1,4 +1,4 @@
-name: Galactic Docker Builds
+name: Galactic Docker Build
 
 on: [push, pull_request]
 
@@ -12,15 +12,8 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
           build-args: ROS_DISTRO=galactic
-          push: true
-          tags: mgons/yasmin:galactic
+          push: false
diff --git a/.github/workflows/galactic-docker-push.yml b/.github/workflows/galactic-docker-push.yml
new file mode 100644
index 0000000..07b3fea
--- /dev/null
+++ b/.github/workflows/galactic-docker-push.yml
@@ -0,0 +1,32 @@
+name: Galactic Docker Push
+
+on:
+  workflow_run:
+    workflows: ["galactic_docker_build"]
+    types:
+      - completed
+
+jobs:
+  galactic_docker_push:
+    if: ${{ github.event.workflow_run.conclusion == 'success' && github.ref == 'refs/heads/main' }}
+
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          build-args: ROS_DISTRO=galactic
+          push: true
+          tags: mgons/yasmin:galactic
diff --git a/.github/workflows/humble-docker-build.yml b/.github/workflows/humble-docker-build.yml
index 8093193..0843b5d 100644
--- a/.github/workflows/humble-docker-build.yml
+++ b/.github/workflows/humble-docker-build.yml
@@ -1,4 +1,4 @@
-name: Humble Docker Builds
+name: Humble Docker Build
 
 on: [push, pull_request]
 
@@ -12,15 +12,8 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
           build-args: ROS_DISTRO=humble
-          push: true
-          tags: mgons/yasmin:humble
+          push: false
diff --git a/.github/workflows/humble-docker-push.yml b/.github/workflows/humble-docker-push.yml
new file mode 100644
index 0000000..2b5df3a
--- /dev/null
+++ b/.github/workflows/humble-docker-push.yml
@@ -0,0 +1,30 @@
+name: Humble Docker Push
+
+on:
+  workflow_run:
+    workflows: ["humble_docker_build"]
+    types:
+      - completed
+
+jobs:
+  humble_docker_push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          build-args: ROS_DISTRO=humble
+          push: true
+          tags: mgons/yasmin:humble
diff --git a/.github/workflows/iron-docker-build.yml b/.github/workflows/iron-docker-build.yml
index 10f63e6..928efae 100644
--- a/.github/workflows/iron-docker-build.yml
+++ b/.github/workflows/iron-docker-build.yml
@@ -1,4 +1,4 @@
-name: Iron Docker Builds
+name: Iron Docker Build
 
 on: [push, pull_request]
 
@@ -12,15 +12,8 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
           build-args: ROS_DISTRO=iron
-          push: true
-          tags: mgons/yasmin:iron
+          push: false
diff --git a/.github/workflows/iron-docker-push.yml b/.github/workflows/iron-docker-push.yml
new file mode 100644
index 0000000..6cf42b4
--- /dev/null
+++ b/.github/workflows/iron-docker-push.yml
@@ -0,0 +1,30 @@
+name: Iron Docker Push
+
+on:
+  workflow_run:
+    workflows: ["iron_docker_build"]
+    types:
+      - completed
+
+jobs:
+  iron_docker_push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          build-args: ROS_DISTRO=iron
+          push: true
+          tags: mgons/yasmin:iron
diff --git a/.github/workflows/jazzy-docker-build.yml b/.github/workflows/jazzy-docker-build.yml
index ebd0f9e..310ce96 100644
--- a/.github/workflows/jazzy-docker-build.yml
+++ b/.github/workflows/jazzy-docker-build.yml
@@ -1,4 +1,4 @@
-name: Jazzy Docker Builds
+name: Jazzy Docker Build
 
 on: [push, pull_request]
 
@@ -12,15 +12,8 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
           build-args: ROS_DISTRO=jazzy
-          push: true
-          tags: mgons/yasmin:jazzy
+          push: false
diff --git a/.github/workflows/jazzy-docker-push.yml b/.github/workflows/jazzy-docker-push.yml
new file mode 100644
index 0000000..7d96041
--- /dev/null
+++ b/.github/workflows/jazzy-docker-push.yml
@@ -0,0 +1,30 @@
+name: Jazzy Docker Push
+
+on:
+  workflow_run:
+    workflows: ["jazzy_docker_build"]
+    types:
+      - completed
+
+jobs:
+  jazzy_docker_push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          build-args: ROS_DISTRO=jazzy
+          push: true
+          tags: mgons/yasmin:jazzy