diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index da20444d..8a804d93 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,7 @@ image: weboaks/node-karma-protractor-chrome
 
 stages:
   - test
+  - pages
 #  - e2e
 
 cache:
@@ -17,6 +18,38 @@ test:
   artifacts:
     paths:
       - coverage/
+  cache:
+    key: "$CI_COMMIT_REF_NAME"
+    paths:
+      - node_modules/
+
+test-build:
+  stage: test
+  script:
+    - yarn install --pure-lockfile
+    - npx ng build --prod
+  only:
+    - master
+
+pages:
+  stage: pages
+  script:
+    - yarn install --pure-lockfile
+    - npx ng build
+    - mv dist/framadate/ public/
+  dependencies:
+    - test
+  artifacts:
+    paths:
+      - public
+    expire_in: '2 hours'
+  only:
+    - develop
+  cache:
+    key: "$CI_COMMIT_REF_NAME"
+    paths:
+      - node_modules/
+    policy: pull
 
 #e2e:
 #  stage: e2e
@@ -25,15 +58,15 @@ test:
 #    - pkill Xvfb
 #    - npm run e2e
 
-pages:
-  stage: .post
-  dependencies:
-    - test
-  script:
-    - mv coverage/ public/
-  artifacts:
-    paths:
-      - public
-    expire_in: 30 days
-  only:
-    - master
+#pages:
+#  stage: .post
+#  dependencies:
+#    - test
+#  script:
+#    - mv coverage/ public/
+#  artifacts:
+#    paths:
+#      - public
+#    expire_in: 30 days
+#  only:
+#    - master