diff --git a/.github/workflows/build_and_publish_docker.yaml b/.github/workflows/build_and_publish_docker.yaml
index 2b63bda..2d06eda 100644
--- a/.github/workflows/build_and_publish_docker.yaml
+++ b/.github/workflows/build_and_publish_docker.yaml
@@ -14,7 +14,7 @@ jobs:
       packages: write
     strategy:
       matrix:
-        ros_distro: ['humble', 'iron']
+        ros_distro: ['humble']
     steps:
       - uses: actions/checkout@v3
       - uses: docker/setup-buildx-action@v2
@@ -27,29 +27,6 @@ jobs:
         with:
           push: true
           file: Dockerfile.debian11
-          tags: ghcr.io/${{ github.repository_owner }}/ros:${{ matrix.ros_distro }}-debian
-          build-args: |
-            ROS_DISTRO=${{ matrix.ros_distro }}
-  build_images_debian12:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      matrix:
-        ros_distro: ['rolling']
-    steps:
-      - uses: actions/checkout@v3
-      - 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@v3
-        with:
-          push: true
-          file: Dockerfile.debian12
-          tags: ghcr.io/${{ github.repository_owner }}/ros:${{ matrix.ros_distro }}-debian
+          tags: ghcr.io/${{ github.repository_owner }}/ros:${{ matrix.ros_distro }}-debian-cmake318
           build-args: |
             ROS_DISTRO=${{ matrix.ros_distro }}
diff --git a/Dockerfile.debian11 b/Dockerfile.debian11
index 999fbea..02e72d3 100644
--- a/Dockerfile.debian11
+++ b/Dockerfile.debian11
@@ -125,15 +125,6 @@ RUN \
   : "remove cache" && \
   rm -rf /var/lib/apt/lists/*
 
-# install new cmake, needed for generate_parameter_library
-WORKDIR $CMAKE_WS
-RUN \
-  : "install cmake" \
-  cd /opt/ && \
-  git clone --depth 1 --branch v3.23.5 https://github.com/Kitware/CMake.git && \
-  cd CMake && \
-  ./bootstrap && make && sudo make install
-
 # ---- ROS ----
 # clone source, ROS core
 ENV ROS2_WS /opt/ros2_ws