diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d16118f24..2d62457839 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,7 @@
 variables:
   PYTHONUNBUFFERED: "1"
+default:
+  interruptible: true
 
 stages:
   - containers
@@ -325,8 +327,10 @@ test-on-netgear-rax40:
   needs: ["build-for-netgear-rax40"]
 
 run-certification-tests:
+  interruptible: false
   stage: test
   variables:
+    GIT_STRATEGY: clone
     # TESTS_TO_RUN needs to be set by the user (or the pipeline schedule)
     GIT_CLONE_PATH: "/builds/prpl-foundation/prplmesh/prplMesh/"
     # device to test with: prplmesh for dummy bwl, axepoint for dwpal on axepoint
diff --git a/ci/certification/generic.yml b/ci/certification/generic.yml
index 6e78d8665d..614ddd725d 100644
--- a/ci/certification/generic.yml
+++ b/ci/certification/generic.yml
@@ -1,9 +1,10 @@
 .certification-generic:
+  interruptible: false
   variables:
+    GIT_STRATEGY: clone
     # DEVICE_UNDER_TEST need to be set when extending the job
     GIT_CLONE_PATH: "/builds/prpl-foundation/prplmesh/prplMesh/"
   script:
-      - echo $CI_COMMIT_DESCRIPTION
       - ci/git-clean-reset.sh /easymesh_cert "$(<"ci/easymesh_cert_version")"
       - sudo /easymesh_cert/run_test_file.py -v -o logs -d $DEVICE_UNDER_TEST "${CI_JOB_NAME%%:*}"
   artifacts: