diff --git a/.github/workflows/ci-scripts-build.yml b/.github/workflows/ci-scripts-build.yml
index c97e526..0bbe44c 100644
--- a/.github/workflows/ci-scripts-build.yml
+++ b/.github/workflows/ci-scripts-build.yml
@@ -8,11 +8,11 @@
 name: devlib2
 
 # Trigger on pushes and PRs to any branch
-on: [push, pull_request]
+on: [push, pull_request, workflow_dispatch]
 
 env:
-    SETUP_PATH: .ci-local:.ci
-    EPICS_TEST_IMPRECISE_TIMING: YES
+  SETUP_PATH: .ci-local:.ci
+  EPICS_TEST_IMPRECISE_TIMING: YES
 
 jobs:
   build-base:
@@ -57,11 +57,6 @@ jobs:
             base: "7.0"
             extra: "CMD_CXXFLAGS=-std=c++11"
 
-          - os: ubuntu-16.04
-            cmp: clang
-            configuration: default
-            base: "7.0"
-
           - os: ubuntu-20.04
             cmp: clang
             configuration: default
@@ -80,18 +75,6 @@ jobs:
             base: "7.0"
             rtems: "4.9"
 
-          - os: ubuntu-16.04
-            cmp: gcc-4.8
-            utoolchain: "4.8"
-            configuration: default
-            base: "7.0"
-
-          - os: ubuntu-16.04
-            cmp: gcc-4.9
-            utoolchain: "4.9"
-            configuration: default
-            base: "7.0"
-
           - os: ubuntu-20.04
             cmp: gcc-8
             utoolchain: "8"
@@ -104,34 +87,34 @@ jobs:
             base: "7.0"
 
     steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: true
-    - name: Cache Dependencies
-      uses: actions/cache@v2
-      with:
-        path: ~/.cache
-        key: ${{ matrix.base }}/${{ matrix.os }}/${{ matrix.cmp }}/${{ matrix.configuration }}/${{ matrix.wine }}${{ matrix.rtems }}/${{ matrix.extra }}
-    - name: Automatic core dump analysis
-      uses: mdavidsaver/ci-core-dumper@master
-    - name: "apt-get install"
-      run: |
-        sudo apt-get update
-        sudo apt-get -y install qemu-system-x86 g++-mingw-w64-x86-64 gdb
-      if: runner.os == 'Linux'
-    - name: "apt-get install ${{ matrix.cmp }}"
-      run: |
-        sudo apt-get update
-        sudo apt-get -y install software-properties-common
-        sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-        sudo apt-get update
-        sudo apt-get -y install g++-${{ matrix.utoolchain }}
-      if: matrix.utoolchain
-    - name: Prepare and compile dependencies
-      run: python .ci/cue.py prepare
-    - name: Build main module
-      run: python .ci/cue.py build
-    - name: Run main module tests
-      run: python .ci/cue.py test
-    - name: Collect and show test results
-      run: python .ci/cue.py test-results
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - name: Cache Dependencies
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache
+          key: ${{ matrix.base }}/${{ matrix.os }}/${{ matrix.cmp }}/${{ matrix.configuration }}/${{ matrix.wine }}${{ matrix.rtems }}/${{ matrix.extra }}
+      - name: Automatic core dump analysis
+        uses: mdavidsaver/ci-core-dumper@master
+      - name: "apt-get install"
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install qemu-system-x86 g++-mingw-w64-x86-64 gdb
+        if: runner.os == 'Linux'
+      - name: "apt-get install ${{ matrix.cmp }}"
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install software-properties-common
+          sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+          sudo apt-get update
+          sudo apt-get -y install g++-${{ matrix.utoolchain }}
+        if: matrix.utoolchain
+      - name: Prepare and compile dependencies
+        run: python .ci/cue.py prepare
+      - name: Build main module
+        run: python .ci/cue.py build
+      - name: Run main module tests
+        run: python .ci/cue.py test
+      - name: Collect and show test results
+        run: python .ci/cue.py test-results