diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 42a5596a52..fb110bf61a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,6 +1,7 @@
 name: Cyrus IMAP CI
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - master
@@ -15,7 +16,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-        image: cyrusimapdocker/cyrus-buster:latest
+        image: ghcr.io/cyrusimap/cyrus-docker:bookworm-libs42
         options: --sysctl net.ipv6.conf.all.disable_ipv6=0 --init
     steps:
     - uses: actions/checkout@v4
@@ -24,9 +25,6 @@ jobs:
     - name: install missing or frequently-updated deps
       shell: bash
       run: |
-        cpanm IO::File::fcntl
-        cpanm Digest::CRC
-        cpanm XML::Simple # XXX could be grabbed from apt by docker image
         cpanm Mail::IMAPTalk # in image, but fetch latest!
     - name: setup git safe directory
       shell: bash
@@ -52,14 +50,6 @@ jobs:
         echo "Mail::IMAPTalk" $(cpanm --info Mail::IMAPTalk)
         /usr/cyrus/libexec/master -V
         /usr/cyrus/sbin/cyr_buildinfo
-    - name: update jmap test suite
-      working-directory: /srv/JMAP-TestSuite.git
-      shell: bash
-      run: |
-        git fetch
-        git checkout origin/master
-        git clean -f -x -d
-        cpanm --installdeps .
     - name: set up cassandane
       working-directory: cassandane
       shell: bash
diff --git a/cassandane/cassandane.ini.dockertests b/cassandane/cassandane.ini.dockertests
index ddbe68e340..3ab562cf72 100644
--- a/cassandane/cassandane.ini.dockertests
+++ b/cassandane/cassandane.ini.dockertests
@@ -64,7 +64,7 @@ suppress = Rename.rename_inbox JMAPBackup Sieve.snooze_tzid MboxEvent.tls_login_
 zoneinfo_dir = /usr/local/cyruslibs/share/cyrus-timezones/zoneinfo
 
 [imaptest]
-basedir = /srv/imaptest.git
+basedir = /srv/imaptest
 suppress = urlauth urlauth2
 
 
@@ -73,5 +73,5 @@ suppress = urlauth urlauth2
 #basedir = /srv/caldavtester.git
 
 [jmaptestsuite]
-basedir = /srv/JMAP-TestSuite.git
+basedir = /srv/JMAP-TestSuite
 suppress =