diff --git a/.gitlab-ci/docker-ros.yml b/.gitlab-ci/docker-ros.yml
index 195ce6b..9554ebb 100644
--- a/.gitlab-ci/docker-ros.yml
+++ b/.gitlab-ci/docker-ros.yml
@@ -250,18 +250,18 @@ Test run-arm64:
   script:
     - |-
       if [[ "${PLATFORM}" =~ amd64 && "${PLATFORM}" =~ arm64 ]]; then
-        [[ "${TARGET}" =~ dev ]] && docker manifest create ${IMG_DEV} --amend ${_IMAGE_DEV_CI_AMD64} --amend ${_IMAGE_DEV_CI_ARM64}
-        [[ "${TARGET}" =~ run ]] && docker manifest create ${IMG_RUN} --amend ${_IMAGE_RUN_CI_AMD64} --amend ${_IMAGE_RUN_CI_ARM64}
+        if [[ "${TARGET}" =~ dev ]]; then docker manifest create ${IMG_DEV} --amend ${_IMAGE_DEV_CI_AMD64} --amend ${_IMAGE_DEV_CI_ARM64}; fi
+        if [[ "${TARGET}" =~ run ]]; then docker manifest create ${IMG_RUN} --amend ${_IMAGE_RUN_CI_AMD64} --amend ${_IMAGE_RUN_CI_ARM64}; fi
       elif [[ "${PLATFORM}" =~ amd64 ]]; then
-        [[ "${TARGET}" =~ dev ]] && docker manifest create ${IMG_DEV} --amend ${_IMAGE_DEV_CI_AMD64}
-        [[ "${TARGET}" =~ run ]] && docker manifest create ${IMG_RUN} --amend ${_IMAGE_RUN_CI_AMD64}
+        if [[ "${TARGET}" =~ dev ]]; then docker manifest create ${IMG_DEV} --amend ${_IMAGE_DEV_CI_AMD64}; fi
+        if [[ "${TARGET}" =~ run ]]; then docker manifest create ${IMG_RUN} --amend ${_IMAGE_RUN_CI_AMD64}; fi
       elif [[ "${PLATFORM}" =~ arm64 ]]; then
-        [[ "${TARGET}" =~ dev ]] && docker manifest create ${IMG_DEV} --amend ${_IMAGE_DEV_CI_ARM64}
-        [[ "${TARGET}" =~ run ]] && docker manifest create ${IMG_RUN} --amend ${_IMAGE_RUN_CI_ARM64}
+        if [[ "${TARGET}" =~ dev ]]; then docker manifest create ${IMG_DEV} --amend ${_IMAGE_DEV_CI_ARM64}; fi
+        if [[ "${TARGET}" =~ run ]]; then docker manifest create ${IMG_RUN} --amend ${_IMAGE_RUN_CI_ARM64}; fi
       fi
     - |-
-      [[ "${TARGET}" =~ dev ]] && docker manifest push ${IMG_DEV}
-      [[ "${TARGET}" =~ run ]] && docker manifest push ${IMG_RUN}
+      if [[ "${TARGET}" =~ dev ]]; then docker manifest push ${IMG_DEV}; fi
+      if [[ "${TARGET}" =~ run ]]; then docker manifest push ${IMG_RUN}; fi
 
 Push CI:
   stage: Push Multi-Arch Images
diff --git a/README.md b/README.md
index ac5589f..fc4248f 100644
--- a/README.md
+++ b/README.md
@@ -98,7 +98,7 @@ jobs:
   docker-ros:
     runs-on: ubuntu-latest
     steps:
-      - uses: ika-rwth-aachen/docker-ros@v1.2.2
+      - uses: ika-rwth-aachen/docker-ros@v1.2.3
         with:
           base-image: rwthika/ros2:humble
           command: ros2 run my_pkg my_node
@@ -110,7 +110,7 @@ jobs:
 
 ```yml
 include:
-  - remote: https://raw.githubusercontent.com/ika-rwth-aachen/docker-ros/v1.2.2/.gitlab-ci/docker-ros.yml
+  - remote: https://raw.githubusercontent.com/ika-rwth-aachen/docker-ros/v1.2.3/.gitlab-ci/docker-ros.yml
 
 variables:
   BASE_IMAGE: rwthika/ros2:humble
@@ -129,7 +129,7 @@ jobs:
   docker-ros:
     runs-on: ubuntu-latest
     steps:
-      - uses: ika-rwth-aachen/docker-ros@v1.2.2
+      - uses: ika-rwth-aachen/docker-ros@v1.2.3
         with:
           base-image: rwthika/ros2:humble
           command: ros2 run my_pkg my_node
@@ -142,7 +142,7 @@ jobs:
 
 ```yml
 include:
-  - remote: https://raw.githubusercontent.com/ika-rwth-aachen/docker-ros/v1.2.2/.gitlab-ci/docker-ros.yml
+  - remote: https://raw.githubusercontent.com/ika-rwth-aachen/docker-ros/v1.2.3/.gitlab-ci/docker-ros.yml
 
 variables:
   BASE_IMAGE: rwthika/ros2:humble
@@ -162,7 +162,7 @@ jobs:
   docker-ros:
     runs-on: ubuntu-latest
     steps:
-      - uses: ika-rwth-aachen/docker-ros@v1.2.2
+      - uses: ika-rwth-aachen/docker-ros@v1.2.3
         with:
           base-image: rwthika/ros2:humble
           command: ros2 run my_pkg my_node
@@ -176,7 +176,7 @@ jobs:
 
 ```yml
 include:
-  - remote: https://raw.githubusercontent.com/ika-rwth-aachen/docker-ros/v1.2.2/.gitlab-ci/docker-ros.yml
+  - remote: https://raw.githubusercontent.com/ika-rwth-aachen/docker-ros/v1.2.3/.gitlab-ci/docker-ros.yml
 
 variables:
   BASE_IMAGE: rwthika/ros2:humble
@@ -197,7 +197,7 @@ jobs:
   docker-ros:
     runs-on: ubuntu-latest
     steps:
-      - uses: ika-rwth-aachen/docker-ros@v1.2.2
+      - uses: ika-rwth-aachen/docker-ros@v1.2.3
         with:
           base-image: rwthika/ros2:humble
           command: ros2 run my_pkg my_node
@@ -210,7 +210,7 @@ jobs:
 
 ```yml
 include:
-  - remote: https://raw.githubusercontent.com/ika-rwth-aachen/docker-ros/v1.2.2/.gitlab-ci/docker-ros.yml
+  - remote: https://raw.githubusercontent.com/ika-rwth-aachen/docker-ros/v1.2.3/.gitlab-ci/docker-ros.yml
 
 variables:
   BASE_IMAGE: rwthika/ros2:humble
@@ -234,7 +234,7 @@ jobs:
         platform: [amd64, arm64]  
     runs-on: [self-hosted, "${{ matrix.platform }}"]
     steps:
-      - uses: ika-rwth-aachen/docker-ros@v1.2.2
+      - uses: ika-rwth-aachen/docker-ros@v1.2.3
         with:
           base-image: rwthika/ros2:humble
           command: ros2 run my_pkg my_node