diff --git a/.ci b/.ci
index aea790683..e0a7c5216 160000
--- a/.ci
+++ b/.ci
@@ -1 +1 @@
-Subproject commit aea79068391fe407fcb817c036bc54f26342bdaa
+Subproject commit e0a7c52160dd22d76ce0aa290f08a2fa200a52a1
diff --git a/.ci-local/adsupport.set b/.ci-local/adsupport.set
index 9f363f616..d660662a4 100644
--- a/.ci-local/adsupport.set
+++ b/.ci-local/adsupport.set
@@ -1,24 +1,6 @@
-MODULES=PVDATA PVACCESS NT PVDATABASE asyn ADSupport
+include os
 
-BASE_DIRNAME=base
-BASE_REPONAME=epics-base
-BASE_REPOOWNER=epics-base
-BASE_VARNAME=EPICS_BASE
-BASE_RECURSIVE=no
-
-PVDATA_REPONAME=pvDataCPP
-PVDATA_REPOOWNER=epics-base
-
-PVACCESS_REPONAME=pvAccessCPP
-PVACCESS_REPOOWNER=epics-base
-
-NT_REPONAME=normativeTypesCPP
-NT_REPOOWNER=epics-base
-
-PVDATABASE_REPONAME=pvDatabaseCPP
-PVDATABASE_REPOOWNER=epics-base
-
-ASYN_REPOOWNER=epics-modules
+ADD_MODULES=ADSUPPORT
 
 ADSUPPORT_REPOOWNER=areaDetector
 ADSUPPORT_HOOK=.ci-local/adsupport-config.py
diff --git a/.ci-local/asyn-config.sh b/.ci-local/asyn-config.sh
new file mode 100755
index 000000000..c767bd91e
--- /dev/null
+++ b/.ci-local/asyn-config.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e -x
+
+[ -d "asyn/asynDriver" ] || exit 1
+
+[ -f "/usr/include/rpc/rpc.h" ] && exit 0
+
+[ -f "/usr/include/tirpc/rpc/rpc.h" ] && \
+ echo "TIRPC=YES" >> "configure/CONFIG_SITE.Common.linux-x86_64"
diff --git a/.ci-local/defaults.set b/.ci-local/defaults.set
deleted file mode 100644
index e69de29bb..000000000
diff --git a/.ci-local/os.set b/.ci-local/os.set
index c6e329346..b3373ab51 100644
--- a/.ci-local/os.set
+++ b/.ci-local/os.set
@@ -1,21 +1,10 @@
-MODULES=PVDATA PVACCESS NT PVDATABASE asyn
+include defaults
 
-BASE_DIRNAME=base
-BASE_REPONAME=epics-base
-BASE_REPOOWNER=epics-base
-BASE_VARNAME=EPICS_BASE
-BASE_RECURSIVE=no
-
-PVDATA_REPONAME=pvDataCPP
-PVDATA_REPOOWNER=epics-base
+MODULES=PVDATA PVACCESS NTYPES PVDATABASE ASYN
 
-PVACCESS_REPONAME=pvAccessCPP
-PVACCESS_REPOOWNER=epics-base
-
-NT_REPONAME=normativeTypesCPP
-NT_REPOOWNER=epics-base
+BASE_RECURSIVE=no
 
 PVDATABASE_REPONAME=pvDatabaseCPP
 PVDATABASE_REPOOWNER=epics-base
 
-ASYN_REPOOWNER=epics-modules
+ASYN_HOOK=.ci-local/asyn-config.sh
diff --git a/.github/workflows/ci-scripts.yml b/.github/workflows/ci-scripts.yml
index 691d2a9e8..156ffe38e 100644
--- a/.github/workflows/ci-scripts.yml
+++ b/.github/workflows/ci-scripts.yml
@@ -9,7 +9,7 @@ on:
   pull_request:
 
 env:
-  SETUP_PATH: .ci-local
+  SETUP_PATH: .ci-local:.ci
 
 jobs:
   test:
@@ -46,6 +46,12 @@ jobs:
             base: "7.0"
             deps: adsupport
 
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+            deps: os
+
           - os: ubuntu-latest
             cmp: gcc
             configuration: default
@@ -70,13 +76,12 @@ jobs:
             base: "7.0"
             deps: adsupport
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: true
 
-    - name: "Linux OS Deps"
-      if: ${{ matrix.deps == 'os' && matrix.os == 'ubuntu-latest' }}
-      shell: bash
+    - name: "Install Linux OS Deps"
+      if: ${{ matrix.deps == 'os' && runner.os == 'Linux' }}
       run: |
         sudo apt-get update
         sudo apt-get -y install \
@@ -126,7 +131,7 @@ jobs:
     - name: Prepare and compile EPICS dependencies
       run: python .ci/cue.py prepare
 
-    - name: "ADSupport Deps"
+    - name: "Configure ADSupport Deps"
       if: ${{ matrix.deps == 'adsupport' }}
       shell: bash
       run: |