diff --git a/.github/workflows/melodic.yml b/.github/workflows/melodic.yml
deleted file mode 100644
index 5a5dbd0..0000000
--- a/.github/workflows/melodic.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: Melodic CI
-
-on: [push, pull_request]
-
-jobs:
-  industrial_ci:
-    strategy:
-      matrix:
-        env:
-          - {ROS_DISTRO: melodic, ROS_REPO: testing}
-          - {ROS_DISTRO: melodic, ROS_REPO: main}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
-      - uses: 'ros-industrial/industrial_ci@master'
-        env: ${{matrix.env}}
diff --git a/.github/workflows/noetic.yml b/.github/workflows/noetic.yml
index 22c221d..9681ad7 100644
--- a/.github/workflows/noetic.yml
+++ b/.github/workflows/noetic.yml
@@ -1,7 +1,16 @@
 name: Noetic CI
-
-on: [push, pull_request]
-
+on:
+  push:
+    branches:
+      - 'master'
+      - 'noetic'
+  pull_request:
+    branches:
+      - 'master'
+      - 'noetic'
+  workflow_dispatch:
+    branches:
+      - '*'
 jobs:
   industrial_ci:
     strategy:
@@ -9,7 +18,7 @@ jobs:
         env:
           - {ROS_DISTRO: noetic, ROS_REPO: testing}
           - {ROS_DISTRO: noetic, ROS_REPO: main}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
         with: