diff --git a/.ci-local/adsupport.set b/.ci-local/adsupport.set
index 4bf8139f9..7b1349a0f 100644
--- a/.ci-local/adsupport.set
+++ b/.ci-local/adsupport.set
@@ -1,25 +1,4 @@
-MODULES=PVDATA PVACCESS NT PVDATABASE asyn ADSupport
-
-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
-ASYN_HOOK=.ci-local/asyn-config.sh
+ADD_MODULES=ADSUPPORT
 
 ADSUPPORT_REPOOWNER=areaDetector
 ADSUPPORT_HOOK=.ci-local/adsupport-config.py
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 ed64790d4..b3373ab51 100644
--- a/.ci-local/os.set
+++ b/.ci-local/os.set
@@ -1,22 +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 1135a4416..3417f5eb3 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: