diff --git a/.github/workflows/ci-ros-lint.yaml b/.github/workflows/ci-ros-lint.yaml
index 49668ef72..e6a9f7c4f 100644
--- a/.github/workflows/ci-ros-lint.yaml
+++ b/.github/workflows/ci-ros-lint.yaml
@@ -5,7 +5,7 @@ on:
 jobs:
   ament_lint:
     name: ament_${{ matrix.linter }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -15,7 +15,7 @@ jobs:
     - uses: ros-tooling/setup-ros@v0.2
     - uses: ros-tooling/action-ros-lint@v0.1
       with:
-        distribution: galactic
+        distribution: humble
         linter: ${{ matrix.linter }}
         package-name:
           smacc2
@@ -39,9 +39,20 @@ jobs:
 
           smacc2_msgs
 
+          sm_advanced_recovery_1
           sm_atomic
-          sm_atomic_performance_test
-          sm_atomic_subscribers_performance_test
+          sm_atomic_http
+          sm_atomic_lifecycle
+          sm_atomic_mode_states
+          sm_branching
+          sm_cl_keyboard_unit_test_1
+          sm_cl_ros2_timer_unit_test_1
+          sm_multi_stage_1
+          sm_pack_ml
+          sm_panda_cl_moveit2z_cb_inventory
+          sm_panda_moveit2z_cb_inventory
+          sm_simple_action_client
+          sm_three_some
 
           sr_all_events_go
           sr_conditional
diff --git a/.github/workflows/humble-binary-build.yml b/.github/workflows/humble-binary-build.yml
index 15175c28a..18c34d053 100644
--- a/.github/workflows/humble-binary-build.yml
+++ b/.github/workflows/humble-binary-build.yml
@@ -28,4 +28,5 @@ jobs:
                 rosdep update
                 rosdep install --from-paths . --ignore-src -r -y
                 source /opt/ros/humble/setup.bash
-                colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release --packages-skip sm_multi_ur5_sim sm_panda_moveit2z_cb_inventory sm_atomic_hierarchy  sm_dance_bot_warehouse_2 sm_multi_ur5_sim sm_three_some sm_atomic_lifecycle sm_branching sm_dance_bot_warehouse_3 sm_pack_ml sm_advanced_recovery_1 sm_atomic_mode_states sm_dance_bot sm_ferrari sm_pubsub_1 sm_atomic sm_atomic_services sm_dance_bot_strikes_back sm_multi_panda_sim sm_respira_1 sm_atomic_24hr sm_autoware_avp sm_dance_bot_warehouse sm_multi_stage_1 sm_panda_moveit2z_cb_inventory sm_dancebot_ue sm_dancebot_artgallery_ue sm_dancebot_fashion_ue sm_dancebot_mine_ue sm_dancebot_office_ue
+                # Skip packages that require special dependencies or configurations:
+                colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release --packages-skip sm_panda_moveit2z_cb_inventory sm_panda_cl_moveit2z_cb_inventory sm_pack_ml sm_atomic sm_atomic_lifecycle sm_atomic_mode_states sm_advanced_recovery_1 sm_branching sm_multi_stage_1 sm_three_some
diff --git a/.github/workflows/humble-semi-binary-build.yml b/.github/workflows/humble-semi-binary-build.yml
index 5f30845d4..8131e785b 100644
--- a/.github/workflows/humble-semi-binary-build.yml
+++ b/.github/workflows/humble-semi-binary-build.yml
@@ -30,4 +30,5 @@ jobs:
                 rosdep install --from-paths . --ignore-src -r -y
                 source /opt/ros/humble/setup.bash
 
-                colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release --packages-skip sm_multi_ur5_sim sm_atomic_hierarchy sm_dance_bot_warehouse_2 sm_multi_ur5_sim sm_three_some sm_atomic_lifecycle sm_branching sm_dance_bot_warehouse_3 sm_pack_ml sm_advanced_recovery_1 sm_atomic_mode_states sm_dance_bot sm_ferrari sm_pubsub_1 sm_atomic sm_atomic_services sm_dance_bot_strikes_back sm_multi_panda_sim sm_respira_1 sm_atomic_24hr sm_autoware_avp sm_dance_bot_warehouse sm_multi_stage_1 sm_panda_moveit2z_cb_inventory
+                # Skip packages that require special dependencies or configurations:
+                colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release --packages-skip sm_panda_moveit2z_cb_inventory sm_panda_cl_moveit2z_cb_inventory sm_pack_ml sm_atomic sm_atomic_lifecycle sm_atomic_mode_states sm_advanced_recovery_1 sm_branching sm_multi_stage_1 sm_three_some