diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 09f4685..b41b28d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,21 @@
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
+  PUBLIC_PATH: public/$CI_COMMIT_BRANCH
 
 pages:
+  environment: $CI_COMMIT_BRANCH
+  stage: deploy
+  when: manual
   script:
     - mkdir .public
     - cp -r * .public
-    - mv .public public
-    - cp public/custom_files/gulpfile.js public/reveal.js/
+    - mv .public/custom_files/gulpfile.js .public/reveal.js/
+    - '[ -d "public/$CI_COMMIT_BRANCH" ] && { rm -rf public/$CI_COMMIT_BRANCH/*; mv .public/* public/$CI_COMMIT_BRANCH/; } || { mkdir -p public/$CI_COMMIT_BRANCH; mv .public/* public/$CI_COMMIT_BRANCH/; }'
+  cache:
+    paths:
+      - public
   artifacts:
     paths:
       - public
-  only:
-    - public
+  rules:
+    - if: $CI_COMMIT_BRANCH =~ /^make/