diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eb1d18867..019de715c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,25 +21,25 @@ jobs:
         env:
           - ROS_DISTRO: kinetic
             ROS_REPO: main
-            UPSTREAM_WORKSPACE: .ci.rosinstall
+            UPSTREAM_WORKSPACE: .kinetic.rosinstall
             DOCKER_RUN_OPTS: --network static_test_net
             BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101'
             IMMEDIATE_TEST_OUTPUT: true
           - ROS_DISTRO: melodic
             ROS_REPO: main
-            UPSTREAM_WORKSPACE: .ci.rosinstall
+            UPSTREAM_WORKSPACE: .melodic.rosinstall
             DOCKER_RUN_OPTS: --network static_test_net
             BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101'
             IMMEDIATE_TEST_OUTPUT: true
           - ROS_DISTRO: kinetic
             ROS_REPO: testing
-            UPSTREAM_WORKSPACE: .ci.rosinstall
+            UPSTREAM_WORKSPACE: .kinetic.rosinstall
             DOCKER_RUN_OPTS: --network static_test_net
             BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101'
             IMMEDIATE_TEST_OUTPUT: true
           - ROS_DISTRO: melodic
             ROS_REPO: testing
-            UPSTREAM_WORKSPACE: .ci.rosinstall
+            UPSTREAM_WORKSPACE: .melodic.rosinstall
             DOCKER_RUN_OPTS: --network static_test_net
             BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101'
             IMMEDIATE_TEST_OUTPUT: true
diff --git a/.kinetic.rosinstall b/.kinetic.rosinstall
new file mode 100644
index 000000000..575aa2cc9
--- /dev/null
+++ b/.kinetic.rosinstall
@@ -0,0 +1,10 @@
+- git:
+    uri: https://github.com/ros-industrial/universal_robot.git
+    local-name: universal_robot
+    version: melodic-devel-staging
+# under kinetic ur_msgs contains the old service definitions so we need to use the newer ones.
+- git:
+    uri: https://github.com/ros-industrial/ur_msgs.git
+    local-name: ur_msgs
+    version: melodic-devel
+
diff --git a/.ci.rosinstall b/.melodic.rosinstall
similarity index 100%
rename from .ci.rosinstall
rename to .melodic.rosinstall