diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f03cb1a22a2cda9d92a7351b45d3e16c11fa287..1523d6c10a773ad4023d5b548453289582a02623 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,6 @@
-cache:
-    paths:
-    - bower_components/
-    - node_modules/
+stages:
+  - test
+  - deploy
 
 before_script:
     - ruby -v
@@ -26,13 +25,26 @@ before_script:
     - gem install jekyll -v '3.3.0'
     - jekyll --version
 
-pages:
-    stage: deploy
-    script:
-    - grunt fullbuild
-    artifacts:
-        paths:
-        - _site
+cache:
+  paths:
+    - node_modules/
+    - bower_components/
+  key: "$CI_BUILD_REPO"
 
-only:
-    - gitlab-pages
\ No newline at end of file
+sample_test:
+  stage: test
+  script:
+    - grunt build
+    - grunt test
+    - grunt jscs --force
+    - grunt jshint --force
+
+sample_deploy:
+  stage: deploy
+  only:
+    - gitlab-pages
+  script:
+    - grunt build babel uglify:dist
+  artifacts:
+    paths:
+      - dist/