diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4689c74b15..dd64abeed4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -251,8 +251,8 @@ test:docs-links:hosted:
 test:prep:
   stage: pre-test
   image: docker
-  only:
-    - staging
+  # only:
+  #   - staging
   services:
     - docker:dind
   script:
@@ -292,7 +292,7 @@ build:docker:
 
 .template:test:staging-deployment:
   image: mendersoftware/mender-test-containers:gui-e2e-testing
-  stage: .post
+  stage: test
   services:
     - docker:dind
   cache:
@@ -318,10 +318,10 @@ build:docker:
   after_script:
     - cd $CI_PROJECT_DIR
     - mkdir logs && cp /root/.npm/_logs/* logs/
-  only:
-    - staging
-  when: delayed
-  start_in: 15 minutes
+  # only:
+  #   - staging
+  # when: delayed
+  # start_in: 15 minutes
   artifacts:
     expire_in: 2w
     paths: