diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dafb8633..a34a0812 100755
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         idf_target: [ esp32, esp32s2, esp32s3, esp32c3, esp32c6]
-        idf_version: [ "espressif/idf:release-v4.4", "espressif/idf:release-v5.2" ]
+        idf_version: [ "espressif/idf:release-v5.2" ]
         exclude:
           # Skip IDF v4 + ESP32C6 combination
           - idf_target: esp32c6
@@ -112,4 +112,4 @@ jobs:
           make -f libmicroros.mk clean
           cd examples/int32_publisher_embeddedrtps
           idf.py set-target ${{ matrix.idf_target }}
-          idf.py build
\ No newline at end of file
+          idf.py build
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 2705db55..5763476d 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -21,6 +21,11 @@ jobs:
           # Skip IDF v4 + ESP32C6 combination
           - idf_target: esp32c6
             idf_version: espressif/idf:release-v4.4
+          # Skip IDF v4 for rolling and kilted
+          - branch: rolling
+            idf_version: espressif/idf:release-v4.4
+          - branch: kilted
+            idf_version: espressif/idf:release-v4.4
 
 
     container:
diff --git a/libmicroros.mk b/libmicroros.mk
index af859701..47f94faf 100644
--- a/libmicroros.mk
+++ b/libmicroros.mk
@@ -44,6 +44,7 @@ $(EXTENSIONS_DIR)/micro_ros_dev/install:
 	git clone -b rolling https://github.com/ros2/ament_cmake_ros src/ament_cmake_ros; \
 	git clone -b rolling https://github.com/ament/ament_index src/ament_index; \
 	touch src/ament_cmake_ros/rmw_test_fixture_implementation/COLCON_IGNORE; \
+	touch src/ament_cmake_ros/rmw_test_fixture/COLCON_IGNORE; \
 	colcon build --cmake-args -DBUILD_TESTING=OFF -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=gcc;
 
 $(EXTENSIONS_DIR)/micro_ros_src/src: