diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e6a19f1..7655247 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -50,6 +50,14 @@ jobs:
              python3 ./gzdev.py repository purge
           grep "/etc/apt/sources.list.d/_gzdev_${repo_to_test}_${repo_type_to_test}.list" log
           grep "/usr/share/keyrings/_gzdev_${repo_to_test}_${repo_type_to_test}.gpg" log
+      - name: Smoke system tests for all the repositories
+        run: |
+          sudo env "PYTHONPATH=$pythonLocation/lib/python${{ matrix.python-version}}/site-packages" \
+              python3 ./gzdev.py repository enable osrf stable
+          sudo env "PYTHONPATH=$pythonLocation/lib/python${{ matrix.python-version}}/site-packages" \
+              python3 ./gzdev.py repository enable ros2 main
+          sudo env "PYTHONPATH=$pythonLocation/lib/python${{ matrix.python-version}}/site-packages" \
+              python3 ./gzdev.py repository enable ros_bootstrap main
       - name: Smoke system tests for ign-docker module
         run: |
           python3 gzdev.py ign-docker-env citadel
diff --git a/plugins/config/repository.yaml b/plugins/config/repository.yaml
index 1dddbf7..d8c17a1 100644
--- a/plugins/config/repository.yaml
+++ b/plugins/config/repository.yaml
@@ -22,7 +22,22 @@ repositories:
             url: http://packages.osrfoundation.org/gazebo/debian-prerelease
           - name: nightly
             url: http://packages.osrfoundation.org/gazebo/debian-nightly
-
+    - name: ros2
+      key: C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
+      key_url: https://raw.githubusercontent.com/ros/rosdistro/master/ros.key
+      linux_distro: ubuntu
+      types:
+        - name: main
+          url: http://packages.ros.org/ros2/ubuntu
+        - name: testing
+          url: http://packages.ros.org/ros2-testing/ubuntu
+    - name: ros-bootstrap
+      key: 4732CE706CD7B19DB0FFE74E8EDB2EF661FC880E
+      key_url: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x4732ce706cd7b19db0ffe74e8edb2ef661fc880e
+      linux_distro: ubuntu
+      types:
+          - name: main
+            url: http://repos.ros.org/repos/ros_bootstrap
 # wildcards are allowed in name, entries are processed in top-down order
 # first entry matching the name is used
 projects: