diff --git a/.github/workflows/ros-ci.yml b/.github/workflows/ros-ci.yml
index 480ab68..427b494 100644
--- a/.github/workflows/ros-ci.yml
+++ b/.github/workflows/ros-ci.yml
@@ -21,8 +21,10 @@ jobs:
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - uses: actions/checkout@v2
-    - name: Setup catkin workspace
-      run: mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/melodic/setup.bash" && catkin_init_workspace
+    - name: Create catkin workspace folder
+      run: mkdir -p /catkin_ws/src && cd /catkin_ws/src
+    - name: Init catkin workspace
+      run: /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace"
     - name: Copy code to catkin workspace
       run: cp -r $GITHUB_WORKSPACE/wrp_sdk /catkin_ws/src
     - name: Run catkin_make