diff --git a/.github/workflows/_make_zpkg.yml b/.github/workflows/_make_zpkg.yml
index 6c2b431c3..a87786857 100644
--- a/.github/workflows/_make_zpkg.yml
+++ b/.github/workflows/_make_zpkg.yml
@@ -43,7 +43,7 @@ jobs:
           cd repos/PandABlocks-fpga
           ln -s CONFIG.example CONFIG
           make WORK_DIR=$WORK_DIR carrier_ip APP_NAME=${{ matrix.app }}
-          make WORK_DIR=$WORK_DIR zpkg APP_NAME=${{ matrix.app }}
+          tini -s -- make WORK_DIR=$WORK_DIR zpkg APP_NAME=${{ matrix.app }}
 
       # Artifacts
       - name: Upload zpkg
diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml
index bc2da45df..62e4729bb 100644
--- a/.github/workflows/code.yml
+++ b/.github/workflows/code.yml
@@ -8,7 +8,7 @@ on:
   push:
     tags:
       - '*'
-    branches: [master]
+    branches: [master, ci_test]
 
 jobs: