diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ce81debce91f37be3e99b9b6277f0efb28f54ab..bd173e228e17a474ba98d560d3465242a8989134 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,8 +2,6 @@ image: ralfjung/opam-ci:latest
 
 stages:
   - build
-  - deploy
-  - build_more
 
 variables:
   CPU_CORES: "9"
@@ -22,6 +20,8 @@ variables:
   - 'cat build-log.txt | egrep "[a-zA-Z0-9_/-]+ \((real|user): [0-9]" | tee build-time.txt'
   # maybe generate and upload doc (has to be in this job as we need coq installed)
   - 'if [[ -n "$DOCDIR" && "$CI_COMMIT_REF_NAME" == master ]]; then build/coqdoc; fi'
+  # maybe create opam package
+  - 'if [[ -n "$OPAM_PKG" && "$CI_COMMIT_REF_NAME" == master ]]; then curl --fail -X POST -F "token=$OPAM_UPDATE_SECRET" -F "ref=master" -F "variables[REPO]=$CI_PROJECT_URL.git" -F "variables[REF]=$CI_COMMIT_REF_NAME" -F "variables[SHA]=$CI_COMMIT_SHA" -F "variables[NAME]=$OPAM_PKG" https://gitlab.mpi-sws.org/api/v4/projects/581/trigger/pipeline; fi'
   cache:
     key: "$CI_JOB_NAME"
     paths:
@@ -29,31 +29,27 @@ variables:
   only:
   - master
   - /^ci/
-
-opam:
-  stage: deploy
-  script:
-  # Send a trigger to the repository doing the work
-  - curl --fail -X POST -F "token=$OPAM_UPDATE_SECRET" -F "ref=master" -F "variables[REPO]=$CI_PROJECT_URL.git" -F "variables[REF]=$CI_COMMIT_REF_NAME" -F "variables[SHA]=$CI_COMMIT_SHA" -F "variables[NAME]=$OPAM_PKG" https://gitlab.mpi-sws.org/api/v4/projects/581/trigger/pipeline
-  variables:
-    OPAM_PKG: "coq-stdpp"
-  only:
-  - master
   except:
   - triggers
 
+## Build jobs
+
+build-coq.dev:
+  <<: *template
+  variables:
+    OPAM_PINS: "coq version dev"
+    VALIDATE: "1"
+
 build-coq.8.7.dev:
   <<: *template
-  stage: build_more
   variables:
     OPAM_PINS: "coq version 8.7.dev"
-  except:
-  - triggers
 
 build-coq.8.7.1:
   <<: *template
   variables:
     OPAM_PINS: "coq version 8.7.1"
+    OPAM_PKG: "coq-stdpp"
     DOCDIR: "coqdoc@center.mpi-sws.org:/stdpp"
   tags:
   - fp-timing
@@ -61,28 +57,18 @@ build-coq.8.7.1:
     paths:
     - build-time.txt
     - build-env.txt
-  except:
-  - triggers
 
 build-coq.8.7.0:
   <<: *template
-  stage: build_more
   variables:
     OPAM_PINS: "coq version 8.7.0"
-  except:
-  - triggers
 
 build-coq.8.6.1:
   <<: *template
   variables:
     OPAM_PINS: "coq version 8.6.1"
-  except:
-  - triggers
 
 build-coq.8.6.0:
   <<: *template
-  stage: build_more
   variables:
     OPAM_PINS: "coq version 8.6"
-  except:
-  - triggers