diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2ccf07f279307aec949322b555eb88ac4db14500..57efcf84cce3b2c67b48982d43e689ebad3510c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,8 +40,6 @@ build-testenv:
   timeout: 3h
   only:
     - schedules
-      #TODO remove before merge
-    - f-fix-pipeline
   script:
     - cd src/test/docker
     - time docker load < /image-cache/caosdb-server-testenv.tar || true
@@ -72,7 +70,7 @@ trigger_build:
   stage: deploy
   script:
     - /usr/bin/curl -X POST
-      -F token=$DEPLOY_TRIGGER_TOKEN
+      -F token=$CI_JOB_TOKEN
       -F "variables[F_BRANCH]=$CI_COMMIT_REF_NAME"
       -F "variables[SERVER]=$CI_COMMIT_REF_NAME"
       -F "variables[TriggerdBy]=SERVER"
@@ -80,9 +78,6 @@ trigger_build:
       -F ref=$DEPLOY_REF https://gitlab.indiscale.com/api/v4/projects/14/trigger/pipeline
 
 # Build the sphinx documentation and make it ready for deployment by Gitlab Pages
-# documentation:
-#   stage: deploy
-
 # Special job for serving a static website. See https://docs.gitlab.com/ee/ci/yaml/README.html#pages
 pages:
   tags: [ cached-dind ]