diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 8b50e96c..0703a05d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -36,6 +36,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: initenv 
         run: scripts/initenv.sh
@@ -51,12 +53,21 @@ jobs:
 
   lxc-test:
     name: LXC deploy and test
-    uses: chatmail/cmlxc/.github/workflows/lxc-test.yml@v0.8.1
+    uses: chatmail/cmlxc/.github/workflows/lxc-test.yml@main
     with:
       cmlxc_commands: |
         cmlxc init 
-        cmlxc deploy-cmdeploy --source ./repo -vv cm0 
-        cmlxc test-mini cm0 
-        cmlxc test-cmdeploy -vv cm0 
-        cmlxc deploy-cmdeploy --source ./repo -vv --ipv4-only cm1
-        cmlxc test-cmdeploy -vv cm0 cm1
+        # single cmdeploy relay test
+        cmlxc -v deploy-cmdeploy --source ./repo cm0
+        cmlxc -v test-mini cm0
+        cmlxc -v test-cmdeploy cm0
+
+        # cross cmdeploy relay test
+        cmlxc -v deploy-cmdeploy --source ./repo --ipv4-only cm1
+        cmlxc -v test-cmdeploy cm0 cm1
+
+        # cross cmdeploy/madmail relay tests
+        cmlxc -v deploy-madmail mad0
+        cmlxc -v test-cmdeploy cm0 mad0
+        cmlxc -v test-mini cm0 mad0
+        cmlxc -v test-mini mad0 cm0