diff --git a/.drone.yml b/.drone.yml
index 5c90723..838293a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -7,112 +7,46 @@ clone:
   depth: 10
 
 steps:
-  - name: master
+  - name: clone
     image: scemama666/qp2_env
     commands:
-    - git clone https://github.com/QuantumPackage/qp2.git --depth=10 --branch=master
+    - git clone https://github.com/QuantumPackage/qp2.git --depth=10 --branch=${DRONE_SOURCE_BRANCH}
+    - bash -c "cd qp2 ; ls -l ; git log"
     - bash -c "cd qp2 ; exec ./configure -i all"
 
-  - name: notify
-    image: drillster/drone-email
-    settings:
-      host:
-        from_secret: hostname
-      from:
-        from_secret: from
-      recipients:
-        from_secret: recipients
-      when:
-        status: [changed, failure]
-
----
-kind: pipeline
-type: docker
-name: master
-
-clone:
-  depth: 10
-
-steps:
-  - name: debug
-    image: scemama666/qp2_configured
+  - name: configure_debug
+    image: scemama666/qp2_env
     commands:
-    - bash -c "cd /qp2 ; git checkout master"
-    - bash -c "cd /qp2 ; git pull"
-    - bash -c "cd /qp2 ; ls -l ; git log"
-    - bash -c "cd /qp2 ; exec ./configure -c ./config/gfortran_debug.cfg"
-    - bash -c "source /qp2/quantum_package.rc ; exec qp_plugins download https://gitlab.com/scemama/qp_plugins_scemama"
-    - bash -c "source /qp2/quantum_package.rc ; exec qp_plugins install champ"
-    - bash -c "cd /qp2 ; source quantum_package.rc ; exec ninja"
-    - bash -c "cd /qp2 ; source quantum_package.rc ; TRAVIS=1 exec qp_test -a"
+    - bash -c "cd qp2 ; exec ./configure -c ./config/gfortran_debug.cfg"
+    - bash -c "source qp2/quantum_package.rc ; exec qp_plugins download https://gitlab.com/scemama/qp_plugins_scemama"
+    - bash -c "source qp2/quantum_package.rc ; exec qp_plugins install champ"
 
-
-  - name: fast
-    image: scemama666/qp2_configured
+  - name: compile
+    image: scemama666/qp2_env
     commands:
-    - bash -c "cd /qp2 ; git checkout master"
-    - bash -c "cd /qp2 ; git pull"
-    - bash -c "cd /qp2 ; ls -l ; git log"
-    - bash -c "cd /qp2 ; exec ./configure -c ./config/gfortran_avx.cfg"
-    - bash -c "source /qp2/quantum_package.rc ; exec qp_plugins download https://gitlab.com/scemama/qp_plugins_scemama"
-    - bash -c "source /qp2/quantum_package.rc ; exec qp_plugins install champ"
-    - bash -c "cd /qp2 ; source quantum_package.rc ; exec ninja"
-    - bash -c "cd /qp2 ; source quantum_package.rc ; TRAVIS=1 exec qp_test -a"
+    - bash -c "cd qp2 ; source quantum_package.rc ; exec ninja"
 
-  - name: notify
-    image: drillster/drone-email
-    settings:
-      host:
-        from_secret: hostname
-      from:
-        from_secret: from
-      recipients:
-        from_secret: recipients
-      when:
-        status: [changed, failure]
-
----
-kind: pipeline
-type: docker
-name: dev
-
-clone:
-  depth: 10
-
-steps:
-  - name: debug
-    image: scemama666/qp2_configured
+  - name: test
+    image: scemama666/qp2_env
     commands:
-    - bash -c "cd /qp2 ; git checkout dev"
-    - bash -c "cd /qp2 ; git pull"
-    - bash -c "cd /qp2 ; ls -l ; git log"
-    - bash -c "cd /qp2 ; exec ./configure -c ./config/gfortran_debug.cfg"
-    - bash -c "source /qp2/quantum_package.rc ; exec qp_plugins download https://gitlab.com/scemama/qp_plugins_scemama"
-    - bash -c "source /qp2/quantum_package.rc ; exec qp_plugins install champ"
-    - bash -c "cd /qp2 ; source quantum_package.rc ; exec ninja"
-    - bash -c "cd /qp2 ; source quantum_package.rc ; TRAVIS=1 exec qp_test -a"
+    - bash -c "cd qp2 ; source quantum_package.rc ; TRAVIS=1 exec qp_test -a"
 
-
-  - name: fast
-    image: scemama666/qp2_configured
+  - name: configure_fast
+    image: scemama666/qp2_env
     commands:
-    - bash -c "cd /qp2 ; git checkout dev"
-    - bash -c "cd /qp2 ; git pull"
-    - bash -c "cd /qp2 ; ls -l ; git log"
-    - bash -c "cd /qp2 ; exec ./configure -c ./config/gfortran_avx.cfg"
-    - bash -c "source /qp2/quantum_package.rc ; exec qp_plugins download https://gitlab.com/scemama/qp_plugins_scemama"
-    - bash -c "source /qp2/quantum_package.rc ; exec qp_plugins install champ"
-    - bash -c "cd /qp2 ; source quantum_package.rc ; exec ninja"
-    - bash -c "cd /qp2 ; source quantum_package.rc ; TRAVIS=1 exec qp_test -a"
+    - bash -c "cd qp2 ; exec ./configure -c ./config/gfortran_avx.cfg"
+    - bash -c "source qp2/quantum_package.rc ; exec qp_plugins download https://gitlab.com/scemama/qp_plugins_scemama"
+    - bash -c "source qp2/quantum_package.rc ; exec qp_plugins install champ"
+
+  - name: compile
+    image: scemama666/qp2_env
+    commands:
+    - bash -c "cd qp2 ; source quantum_package.rc ; exec ninja"
+
+  - name: test
+    image: scemama666/qp2_env
+    commands:
+    - bash -c "cd qp2 ; source quantum_package.rc ; exec qp_test -a"
+
+
 
-  - name: notify
-    image: drillster/drone-email
-    settings:
-      host:
-        from_secret: hostname
-      from:
-        from_secret: from
-      recipients:
-        from_secret: recipients
-      when:
-        status: [changed, failure]