diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f34232f..87e6c1b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,6 @@
 stages:
   - build
   - cleanup_build
-  - deploy_new
   - deploy
 #  - cleanup
 
@@ -56,53 +55,32 @@ cleanup_build_job:
   when: on_failure
 
 pages:
-  stage: deploy_new
-  environment: pages
+  stage: deploy
+  environment: staging
   except:
     - tags
     - master
   script:
-    - mkdir -p public/{app/converter,node_modules/{@angular,core-js/client,zone.js/dist,reflect-metadata,rxjs,systemjs/dist,utf8,quoted-printable,punycode}}
-    - cp -a index.html abeezee-regular.woff freemono.* package.json systemjs.config.js public/
-    - cp -a app/*.css app/*.html app/*.js app/*.js.map public/app/
-    - cp -a app/converter/*.js app/converter/*.js.map public/app/converter/
-    - cp -a node_modules/@angular/* public/node_modules/@angular/
-    - cp -a node_modules/core-js/client/shim.js public/node_modules/core-js/client/
-    - cp -a node_modules/zone.js/dist/zone.js public/node_modules/zone.js/dist/
-    - cp -a node_modules/reflect-metadata/Reflect.js public/node_modules/reflect-metadata/
-    - cp -a node_modules/rxjs/* public/node_modules/rxjs/
-    - cp -a node_modules/systemjs/dist/system.src.js public/node_modules/systemjs/dist/
-    - cp -a node_modules/utf8/utf8.js public/node_modules/utf8/
-    - cp -a node_modules/quoted-printable/quoted-printable.js public/node_modules/quoted-printable/
-    - cp -a node_modules/punycode/punycode.js public/node_modules/punycode/
+    - mkdir -p public .public/{app/converter,node_modules/{@angular,core-js/client,zone.js/dist,reflect-metadata,rxjs,systemjs/dist,utf8,quoted-printable,punycode}}
+    - cp -a index.html abeezee-regular.woff freemono.* package.json systemjs.config.js .public/
+    - cp -a app/*.css app/*.html app/*.js app/*.js.map .public/app/
+    - cp -a app/converter/*.js app/converter/*.js.map .public/app/converter/
+    - cp -a node_modules/@angular/* .public/node_modules/@angular/
+    - cp -a node_modules/core-js/client/shim.js .public/node_modules/core-js/client/
+    - cp -a node_modules/zone.js/dist/zone.js .public/node_modules/zone.js/dist/
+    - cp -a node_modules/reflect-metadata/Reflect.js .public/node_modules/reflect-metadata/
+    - cp -a node_modules/rxjs/* .public/node_modules/rxjs/
+    - cp -a node_modules/systemjs/dist/system.src.js .public/node_modules/systemjs/dist/
+    - cp -a node_modules/utf8/utf8.js .public/node_modules/utf8/
+    - cp -a node_modules/quoted-printable/quoted-printable.js .public/node_modules/quoted-printable/
+    - cp -a node_modules/punycode/punycode.js .public/node_modules/punycode/
+    - mv .public public/${CI_BUILD_REF_NAME}
   artifacts:
     paths:
       - public
   dependencies:
     - build_job
 
-develop:
-  stage: deploy
-  <<: *run_deploy
-  environment: develop
-  except:
-    - tags
-    - master
-    - develop
-  variables:
-    ENVIRON: develop
-    TARGET: $WWW_DEPLOY_ROOT_DEVELOP
-
-staging:
-  stage: deploy
-  <<: *run_deploy
-  environment: staging
-  only:
-    - develop
-  variables:
-    ENVIRON: staging
-    TARGET: $WWW_DEPLOY_ROOT_STAGING
-
 production:
   stage: deploy
   <<: *run_deploy