diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a07ce31c..2efe05f1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,13 +1,16 @@
 name: CI
 
 on:
-  pull_request:
-    paths-ignore:
-      - 'README.md'
-    branches:
-      - '**'
   workflow_call:
+<<<<<<< HEAD
   
+=======
+    inputs:
+      ci_target_ref:
+        required: true
+        type: string
+
+>>>>>>> 3379e73 (Rework CI (#696))
 env:
   ROS_DISTRO: iron
 
@@ -23,6 +26,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           path: src/micro_ros_setup
+          ref: ${{ inputs.ci_target_ref }}
 
       - uses: ros-tooling/setup-ros@0.7.0
         with:
@@ -63,6 +67,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           path: src/micro_ros_setup
+          ref: ${{ inputs.ci_target_ref }}
 
       - uses: ros-tooling/setup-ros@0.7.0
         with:
@@ -210,6 +215,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           path: src/micro_ros_setup
+          ref: ${{ inputs.ci_target_ref }}
 
       - uses: ros-tooling/setup-ros@0.7.0
         with:
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 71b0911e..ae22d034 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -10,6 +10,7 @@ on:
 
 jobs:
 
+<<<<<<< HEAD
   micro_ros_build:
     runs-on: ubuntu-latest
     strategy:
@@ -621,3 +622,24 @@ jobs:
       - name: installation
         run: |
             (test -f install/micro_ros_agent/lib/micro_ros_agent/micro_ros_agent) && true || false
+=======
+    Jazzy:
+        uses: micro-ROS/micro_ros_setup/.github/workflows/ci.yml@jazzy
+        with:
+            ci_target_ref: 'jazzy'
+
+    Rolling:
+        uses: micro-ROS/micro_ros_setup/.github/workflows/ci.yml@rolling
+        with:
+            ci_target_ref: 'rolling'
+
+    Humble:
+        uses: micro-ROS/micro_ros_setup/.github/workflows/ci.yml@humble
+        with:
+            ci_target_ref: 'humble'
+
+    Iron:
+        uses: micro-ROS/micro_ros_setup/.github/workflows/ci.yml@iron
+        with:
+            ci_target_ref: 'iron'
+>>>>>>> 3379e73 (Rework CI (#696))
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
new file mode 100644
index 00000000..6f7e5ed6
--- /dev/null
+++ b/.github/workflows/pr.yml
@@ -0,0 +1,15 @@
+name: Pull Request CI
+
+on:
+  pull_request:
+    paths-ignore:
+      - 'README.md'
+    branches:
+      - '**'
+
+jobs:
+
+    CI:
+        uses: ./.github/workflows/ci.yml
+        with:
+            ci_target_ref: ${{ github.event.pull_request.head.ref }}