diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f103e561c92174776eade89a49dbd92232523e39..3f25a33074be268a806d29621753f661357a42de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,4 +6,13 @@ test_deploy:
     - mkdir -p ~/.ssh && ssh-keyscan kwant-project.org >> ~/.ssh/known_hosts
     - echo $TEST_WEBSITE_KEY > deploy_key && sed -i 's/\r /\n/g' deploy_key && chmod 600 deploy_key
     - nikola deploy
-  allow_failure: true
+  except:
+    - master
+
+master_deploy:
+  script:
+    - mkdir -p ~/.ssh && ssh-keyscan kwant-project.org >> ~/.ssh/known_hosts
+    - echo $MASTER_WEBSITE_KEY > deploy_key && sed -i 's/\r /\n/g' deploy_key && chmod 600 deploy_key
+    - nikola deploy
+  only:
+    - master