diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 01c91c6e..74baae26 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -7,7 +7,7 @@ on:
       - master
 jobs:
   tests:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
@@ -34,7 +34,7 @@ jobs:
       uses: actions/checkout@v2
       with:
         repository: icatproject-contrib/icat-ansible
-        ref: change-payara-setup-script-url
+        ref: ubuntu-20-work
         path: icat-ansible
     - name: Install Ansible
       run: pip install -r icat-ansible/requirements.txt
@@ -91,7 +91,7 @@ jobs:
       uses: codecov/codecov-action@v1
 
   linting:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     name: Linting
     steps:
     - name: Setup Python
@@ -111,7 +111,7 @@ jobs:
       run: nox -s lint
 
   formatting:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     name: Code Formatting
     steps:
     - name: Setup Python
@@ -131,7 +131,7 @@ jobs:
       run: nox -s black
 
   safety:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     name: Dependency Safety
     steps:
     - name: Setup Python
@@ -151,7 +151,7 @@ jobs:
       run: nox -s safety
 
   generator-script-testing:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     continue-on-error: true
     name: icatdb Generator Script Consistency Test
     steps:
@@ -175,7 +175,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: icatproject-contrib/icat-ansible
-          ref: change-payara-setup-script-url
+          ref: ubuntu-20-work
           path: icat-ansible
       - name: Install Ansible
         run: pip install -r icat-ansible/requirements.txt