diff --git a/.github/workflows/test-devel.yml b/.github/workflows/test-devel.yml
index 2458237..78162cd 100644
--- a/.github/workflows/test-devel.yml
+++ b/.github/workflows/test-devel.yml
@@ -25,15 +25,15 @@ jobs:
       uses: actions/checkout@v3
       with:
         path: anope
-        ref: 2.0.9
+        ref: '2.1'
         repository: anope/anope
     - name: Build Anope
       run: |
         cd $GITHUB_WORKSPACE/anope/
-        cp $GITHUB_WORKSPACE/data/anope/* .
-        CFLAGS=-O0 ./Config -quick
-        make -C build -j 4
-        make -C build install
+        sudo apt-get install ninja-build --no-install-recommends
+        mkdir build && cd build
+        cmake -DCMAKE_INSTALL_PREFIX=$HOME/.local/ -DPROGRAM_NAME=anope -DUSE_PCH=ON -GNinja ..
+        ninja install
     - name: Make artefact tarball
       run: cd ~; tar -czf artefacts-anope.tar.gz .local/ go/
     - name: Upload build artefacts
diff --git a/.github/workflows/test-devel_release.yml b/.github/workflows/test-devel_release.yml
index c385289..1e289b1 100644
--- a/.github/workflows/test-devel_release.yml
+++ b/.github/workflows/test-devel_release.yml
@@ -25,15 +25,15 @@ jobs:
       uses: actions/checkout@v3
       with:
         path: anope
-        ref: 2.0.9
+        ref: '2.0'
         repository: anope/anope
     - name: Build Anope
       run: |
         cd $GITHUB_WORKSPACE/anope/
-        cp $GITHUB_WORKSPACE/data/anope/* .
-        CFLAGS=-O0 ./Config -quick
-        make -C build -j 4
-        make -C build install
+        sudo apt-get install ninja-build --no-install-recommends
+        mkdir build && cd build
+        cmake -DCMAKE_INSTALL_PREFIX=$HOME/.local/ -DPROGRAM_NAME=anope -DUSE_PCH=ON -GNinja ..
+        ninja install
     - name: Make artefact tarball
       run: cd ~; tar -czf artefacts-anope.tar.gz .local/ go/
     - name: Upload build artefacts
diff --git a/.github/workflows/test-stable.yml b/.github/workflows/test-stable.yml
index cf3a950..4f7b24d 100644
--- a/.github/workflows/test-stable.yml
+++ b/.github/workflows/test-stable.yml
@@ -25,15 +25,15 @@ jobs:
       uses: actions/checkout@v3
       with:
         path: anope
-        ref: 2.0.9
+        ref: 2.0.14
         repository: anope/anope
     - name: Build Anope
       run: |
         cd $GITHUB_WORKSPACE/anope/
-        cp $GITHUB_WORKSPACE/data/anope/* .
-        CFLAGS=-O0 ./Config -quick
-        make -C build -j 4
-        make -C build install
+        sudo apt-get install ninja-build --no-install-recommends
+        mkdir build && cd build
+        cmake -DCMAKE_INSTALL_PREFIX=$HOME/.local/ -DPROGRAM_NAME=anope -DUSE_PCH=ON -GNinja ..
+        ninja install
     - name: Make artefact tarball
       run: cd ~; tar -czf artefacts-anope.tar.gz .local/ go/
     - name: Upload build artefacts
diff --git a/data/anope/config.cache b/data/anope/config.cache
deleted file mode 100644
index 71f30cd..0000000
--- a/data/anope/config.cache
+++ /dev/null
@@ -1,8 +0,0 @@
-INSTDIR="$HOME/.local/"
-RUNGROUP=""
-UMASK=077
-DEBUG="yes"
-USE_PCH="yes"
-EXTRA_INCLUDE_DIRS=""
-EXTRA_LIB_DIRS=""
-EXTRA_CONFIG_ARGS=""
diff --git a/irctest/controllers/anope_services.py b/irctest/controllers/anope_services.py
index bf577bf..65ab4d1 100644
--- a/irctest/controllers/anope_services.py
+++ b/irctest/controllers/anope_services.py
@@ -101,7 +101,7 @@ class AnopeController(BaseServicesController, DirectoryBasedController):
             pass
 
         assert self.directory
-        services_path = shutil.which("services")
+        services_path = shutil.which("anope")
         assert services_path
 
         # Config and code need to be in the same directory, *obviously*
@@ -109,7 +109,7 @@ class AnopeController(BaseServicesController, DirectoryBasedController):
 
         self.proc = subprocess.Popen(
             [
-                "services",
+                "anope",
                 "-n",  # don't fork
                 "--config=services.conf",  # can't be an absolute path
                 # "--logdir",
diff --git a/workflows.yml b/workflows.yml
index 3ebf5c9..8a3c5fd 100644
--- a/workflows.yml
+++ b/workflows.yml
@@ -343,16 +343,16 @@ software:
         separate_build_job: true
         path: anope
         refs:
-            stable: "2.0.9"
-            release: "2.0.9"
-            devel: "2.0.9"
-            devel_release: "2.0.9"
+            stable: "2.0.14"
+            release: "2.1.1"
+            devel: "2.1"
+            devel_release: "2.0"
         build_script: |
             cd $GITHUB_WORKSPACE/anope/
-            cp $GITHUB_WORKSPACE/data/anope/* .
-            CFLAGS=-O0 ./Config -quick
-            make -C build -j 4
-            make -C build install
+            sudo apt-get install ninja-build --no-install-recommends
+            mkdir build && cd build
+            cmake -DCMAKE_INSTALL_PREFIX=$HOME/.local/ -DPROGRAM_NAME=anope -DUSE_PCH=ON -GNinja ..
+            ninja install
 
     dlk:
         name: Dlk