diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 80f9269b89..be9cfad106 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,6 +48,7 @@ publish_smoketest_runner:
 
 smoketest_play:
   stage: smoketest_play
+  resource_group: playground
   dependencies:
     - publish_smoketest_runner
     - publish_deployer
@@ -65,6 +66,7 @@ smoketest_play:
 
 smoketest_staging:
   stage: smoketest_staging
+  resource_group: staging
   dependencies:
     - publish_smoketest_runner
     - publish_deployer
diff --git a/bin/ssa-end-to-end-testing/k8s-deployer/k8s/components/smoketest.jsonnet b/bin/ssa-end-to-end-testing/k8s-deployer/k8s/components/smoketest.jsonnet
index 190c39c013..38185080a2 100644
--- a/bin/ssa-end-to-end-testing/k8s-deployer/k8s/components/smoketest.jsonnet
+++ b/bin/ssa-end-to-end-testing/k8s-deployer/k8s/components/smoketest.jsonnet
@@ -13,7 +13,7 @@ local job = {
         },
     },
     spec: {
-        activeDeadlineSeconds: 600,
+        activeDeadlineSeconds: 1800,
         ttlSecondsAfterFinished: 100,
         template: {
             metadata: {