diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 134b50a2..f75fc3d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,11 @@
 image: ghcr.io/siemens/kas/kas:latest-release
 
-  # First do a common bootstrap, and then build all the targets
+# These are needed as the k8s executor doesn't respect the container entrypoint
+# by default
+variables:
+  FF_USE_LEGACY_KUBERNETES_EXECUTION_STRATEGY: 0
+  FF_KUBERNETES_HONOR_ENTRYPOINT: 1
+
 stages:
   - prep
   - bootstrap
@@ -26,6 +31,8 @@ stages:
 # Generalised fragment to do a Kas build
 .build:
   extends: .setup
+  variables:
+    KUBERNETES_CPU_REQUEST: $CPU_REQUEST
   interruptible: true
   script:
     - KASFILES=$(./ci/jobs-to-kas $CI_JOB_NAME)