diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c32beda19a4961b5ce5b8e3ea7308ff82f3467c2_LmdpdGxhYi1jaS55bWw=..91a46f25a403c57e6390f5b783eb57586ffa6f15_LmdpdGxhYi1jaS55bWw= 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,8 +7,8 @@
 # repository in /go/src/mydomainperso.com/repos/projectname
 # Thus, making a symbolic link corrects this.
 before_script:
-    - mkdir -p "/go/src/gitlab.zerbytes.net/${CI_PROJECT_NAMESPACE}"
-    - ln -sf "${CI_PROJECT_DIR}" "/go/src/gitlab.zerbytes.net/${CI_PROJECT_PATH}"
-    - cd "/go/src/gitlab.zerbytes.net/${CI_PROJECT_PATH}/"
+  - mkdir -p "/go/src/gitlab.zerbytes.net/${CI_PROJECT_NAMESPACE}"
+  - ln -sf "${CI_PROJECT_DIR}" "/go/src/gitlab.zerbytes.net/${CI_PROJECT_PATH}"
+  - cd "/go/src/gitlab.zerbytes.net/${CI_PROJECT_PATH}/"
 
 stages:
@@ -13,8 +13,9 @@
 
 stages:
-    - test
-    - build
-    - release
-    - deploy
+  - test
+  - build
+  - release
+  - review
+  - deploy
 
 test:
@@ -19,10 +20,10 @@
 
 test:
-    stage: test
-    script:
-        - go get -u github.com/kardianos/govendor
-        - /go/bin/govendor test +local
+  stage: test
+  script:
+    - go get -u github.com/kardianos/govendor
+    - /go/bin/govendor test +local
 
 test2:
   stage: test
   script:
@@ -25,8 +26,8 @@
 
 test2:
   stage: test
   script:
-      - sleep 3
-      - echo "We did it! Something else runs in parallel!"
+    - sleep 3
+    - echo "We did it! Something else runs in parallel!"
 
 compile:
@@ -31,14 +32,14 @@
 
 compile:
-    stage: build
-    variables:
-      VERSION: "1.0.18"
-    script:
-        # Add here all the dependencies, or use glide/govendor/...
-        # to get them automatically.
-        # TODO Better put this in a Makefile soon
-        - go build -race -ldflags "-X gitlab.zerbytes.net/${CI_PROJECT_PATH}/vendor/github.com/prometheus/common/version.Version=$VERSION -X gitlab.zerbytes.net/${CI_PROJECT_PATH}/vendor/github.com/prometheus/common/version.Revision=${CI_COMMIT_SHA} -X gitlab.zerbytes.net/${CI_PROJECT_PATH}/vendor/github.com/prometheus/common/version.Branch=${CI_COMMIT_REF_NAME} -X gitlab.zerbytes.net/${CI_PROJECT_PATH}/vendor/github.com/prometheus/common/version.BuildUser=$(whoami)@$(hostname) -X gitlab.zerbytes.net/${CI_PROJECT_PATH}/vendor/github.com/prometheus/common/version.BuildDate=$(date +%Y%m%d-%H:%M:%S) -extldflags '-static'" -o app
-    artifacts:
-        paths:
-            - app
+  stage: build
+  variables:
+    VERSION: "1.0.18"
+  script:
+    # Add here all the dependencies, or use glide/govendor/...
+    # to get them automatically.
+    # TODO Better put this in a Makefile soon
+    - go build -race -ldflags "-X gitlab.zerbytes.net/${CI_PROJECT_PATH}/vendor/github.com/prometheus/common/version.Version=$VERSION -X gitlab.zerbytes.net/${CI_PROJECT_PATH}/vendor/github.com/prometheus/common/version.Revision=${CI_COMMIT_SHA} -X gitlab.zerbytes.net/${CI_PROJECT_PATH}/vendor/github.com/prometheus/common/version.Branch=${CI_COMMIT_REF_NAME} -X gitlab.zerbytes.net/${CI_PROJECT_PATH}/vendor/github.com/prometheus/common/version.BuildUser=$(whoami)@$(hostname) -X gitlab.zerbytes.net/${CI_PROJECT_PATH}/vendor/github.com/prometheus/common/version.BuildDate=$(date +%Y%m%d-%H:%M:%S) -extldflags '-static'" -o app
+  artifacts:
+    paths:
+      - app
 
@@ -44,3 +45,3 @@
 
-# example job to upload the built release to an S3 server with mc
+# Example job to upload the built release to a S3 server with mc
 #release_upload:
@@ -46,11 +47,11 @@
 #release_upload:
-#    stage: release
-#    image: minio/mc
-#    script:
-#      - echo "=> We already have artifact sotrage in GitLab! This is for demonstational purposes only."
-#      - mc config host add edenmalmoe https://s3.edenmal.net ${ACCESS_KEY} ${SECRET_KEY} S3v4
-#      - mc mb -p edenmalmoe/build-release-${CI_PROJECT_NAME}/
-#      - mc cp app edenmalmoe/build-release-${CI_PROJECT_NAME}/
+#  stage: release
+#  image: minio/mc
+#  script:
+#    - echo "=> We already have artifact sotrage in GitLab! This is for demonstational purposes only."
+#    - mc config host add edenmalmoe https://s3.edenmal.net ${ACCESS_KEY} ${SECRET_KEY} S3v4
+#    - mc mb -p edenmalmoe/build-release-${CI_PROJECT_NAME}/
+#    - mc cp app edenmalmoe/build-release-${CI_PROJECT_NAME}/
 
 
 image_build:
@@ -54,17 +55,17 @@
 
 
 image_build:
-    stage: release
-    image: docker:latest
-    variables:
-        DOCKER_HOST: tcp://localhost:2375
-    services:
-        - docker:dind
-    script:
-        - docker info
-        - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} registry.zerbytes.net
-        - docker build -t registry.zerbytes.net/${CI_PROJECT_PATH}:latest .
-        - docker tag registry.zerbytes.net/${CI_PROJECT_PATH}:latest registry.zerbytes.net/${CI_PROJECT_PATH}:${CI_COMMIT_REF_NAME}
-        - test ! -z "${CI_COMMIT_TAG}" && docker push registry.zerbytes.net/${CI_PROJECT_PATH}:latest
-        - docker push registry.zerbytes.net/${CI_PROJECT_PATH}:${CI_COMMIT_REF_NAME}
+  stage: release
+  image: docker:latest
+  variables:
+    DOCKER_HOST: tcp://localhost:2375
+  services:
+    - docker:dind
+  script:
+    - docker info
+    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} registry.zerbytes.net
+    - docker build -t registry.zerbytes.net/${CI_PROJECT_PATH}:latest .
+    - docker tag registry.zerbytes.net/${CI_PROJECT_PATH}:latest registry.zerbytes.net/${CI_PROJECT_PATH}:${CI_COMMIT_REF_NAME}
+    - test ! -z "${CI_COMMIT_TAG}" && docker push registry.zerbytes.net/${CI_PROJECT_PATH}:latest
+    - docker push registry.zerbytes.net/${CI_PROJECT_PATH}:${CI_COMMIT_REF_NAME}
 
@@ -70,23 +71,45 @@
 
-deploy_dev:
-    image: registry.gitlab.com/gitlab-examples/kubernetes-deploy
-    stage: deploy
-    environment:
-        name: dev
-        url: https://dev-presentation-gitlab-k8s.edenmal.net
-    script:
-        - echo "${KUBE_CA_PEM}" > kube_ca.pem
-        - kubectl config set-cluster default-cluster --server=${KUBE_URL} --certificate-authority="$(pwd)/kube_ca.pem"
-        - kubectl config set-credentials default-admin --token=${KUBE_TOKEN}
-        - kubectl config set-context default-system --cluster=default-cluster --user=default-admin --namespace ${KUBE_NAMESPACE}
-        - kubectl config use-context default-system
-        - kubectl cluster-info
-        - cd manifests/
-        - sed -i "s/__CI_ENVIRONMENT_SLUG__/${CI_ENVIRONMENT_SLUG}/" deployment.yaml ingress.yaml service.yaml
-        - sed -i "s/__VERSION__/${CI_COMMIT_REF_NAME}/" deployment.yaml ingress.yaml service.yaml
-        - kubectl get deployments -l app=${CI_ENVIRONMENT_SLUG}
-        - if [[ $(kubectl apply -f deployment.yaml) == *"unchanged"* ]]; then kubectl patch deployment ${CI_ENVIRONMENT_SLUG} -p "{\"spec\":{\"template\":{\"metadata\":{\"annotations\":{\"ci-last-updated\":\"$(date +'%s')\"}}}}}"; fi
-        - kubectl apply -f service.yaml || true
-        - kubectl apply -f ingress.yaml
+deploy_review:
+  image: registry.gitlab.com/gitlab-examples/kubernetes-deploy
+  stage: review
+  environment:
+    name: review/$CI_BUILD_REF_NAME
+    url: https://$CI_BUILD_REF_SLUG-presentation-gitlab-k8s.edenmal.net
+    on_stop: stop_review
+  script:
+    - echo "${KUBE_CA_PEM}" > kube_ca.pem
+    - kubectl config set-cluster default-cluster --server=${KUBE_URL} --certificate-authority="$(pwd)/kube_ca.pem"
+    - kubectl config set-credentials default-admin --token=${KUBE_TOKEN}
+    - kubectl config set-context default-system --cluster=default-cluster --user=default-admin --namespace ${KUBE_NAMESPACE}
+    - kubectl config use-context default-system
+    - kubectl cluster-info
+    - cd manifests/
+    - sed -i "s/__CI_ENVIRONMENT_SLUG__/${CI_ENVIRONMENT_SLUG}/" deployment.yaml ingress.yaml service.yaml
+    - sed -i "s/__VERSION__/${CI_COMMIT_REF_NAME}/" deployment.yaml ingress.yaml service.yaml
+    - kubectl get deployments -l app=${CI_ENVIRONMENT_SLUG}
+    - if [[ $(kubectl apply -f deployment.yaml) == *"unchanged"* ]]; then kubectl patch deployment ${CI_ENVIRONMENT_SLUG} -p "{\"spec\":{\"template\":{\"metadata\":{\"annotations\":{\"ci-last-updated\":\"$(date +'%s')\"}}}}}"; fi
+    - kubectl apply -f service.yaml || true
+    - kubectl apply -f ingress.yaml
+
+stop_review:
+  image: registry.gitlab.com/gitlab-examples/kubernetes-deploy
+  stage: review
+  environment:
+    name: review/$CI_BUILD_REF_NAME
+    action: stop
+  script:
+    - echo "${KUBE_CA_PEM}" > kube_ca.pem
+    - kubectl config set-cluster default-cluster --server=${KUBE_URL} --certificate-authority="$(pwd)/kube_ca.pem"
+    - kubectl config set-credentials default-admin --token=${KUBE_TOKEN}
+    - kubectl config set-context default-system --cluster=default-cluster --user=default-admin --namespace ${KUBE_NAMESPACE}
+    - kubectl config use-context default-system
+    - kubectl cluster-info
+    - cd manifests/
+    - sed -i "s/__CI_ENVIRONMENT_SLUG__/${CI_ENVIRONMENT_SLUG}/" deployment.yaml ingress.yaml service.yaml
+    - sed -i "s/__VERSION__/${CI_COMMIT_REF_NAME}/" deployment.yaml ingress.yaml service.yaml
+    - kubectl get deployments -l app=${CI_ENVIRONMENT_SLUG}
+    - kubectl delete -f deployment.yaml -f service.yaml -f ingress.yaml
+    - kubectl delete -f service.yaml
+    - kubectl delete -f ingress.yaml
 
 deploy_live:
@@ -91,24 +114,24 @@
 
 deploy_live:
-    image: registry.gitlab.com/gitlab-examples/kubernetes-deploy
-    stage: deploy
-    environment:
-        name: live
-        url: https://live-presentation-gitlab-k8s.edenmal.net
-    only:
-        - tags
-    when: manual
-    script:
-        - echo "${KUBE_CA_PEM}" > kube_ca.pem
-        - kubectl config set-cluster default-cluster --server=${KUBE_URL} --certificate-authority="$(pwd)/kube_ca.pem"
-        - kubectl config set-credentials default-admin --token=${KUBE_TOKEN}
-        - kubectl config set-context default-system --cluster=default-cluster --user=default-admin --namespace ${KUBE_NAMESPACE}
-        - kubectl config use-context default-system
-        - kubectl cluster-info
-        - cd manifests/
-        - sed -i "s/__CI_ENVIRONMENT_SLUG__/${CI_ENVIRONMENT_SLUG}/" deployment.yaml ingress.yaml service.yaml
-        - sed -i "s/__VERSION__/${CI_COMMIT_REF_NAME}/" deployment.yaml ingress.yaml service.yaml
-        - kubectl get deployments -l app=${CI_ENVIRONMENT_SLUG}
-        - kubectl apply -f deployment.yaml
-        - kubectl apply -f service.yaml || true
-        - kubectl apply -f ingress.yaml
+  image: registry.gitlab.com/gitlab-examples/kubernetes-deploy
+  stage: deploy
+  environment:
+    name: live
+    url: https://live-presentation-gitlab-k8s.edenmal.net
+  only:
+    - tags
+  when: manual
+  script:
+    - echo "${KUBE_CA_PEM}" > kube_ca.pem
+    - kubectl config set-cluster default-cluster --server=${KUBE_URL} --certificate-authority="$(pwd)/kube_ca.pem"
+    - kubectl config set-credentials default-admin --token=${KUBE_TOKEN}
+    - kubectl config set-context default-system --cluster=default-cluster --user=default-admin --namespace ${KUBE_NAMESPACE}
+    - kubectl config use-context default-system
+    - kubectl cluster-info
+    - cd manifests/
+    - sed -i "s/__CI_ENVIRONMENT_SLUG__/${CI_ENVIRONMENT_SLUG}/" deployment.yaml ingress.yaml service.yaml
+    - sed -i "s/__VERSION__/${CI_COMMIT_REF_NAME}/" deployment.yaml ingress.yaml service.yaml
+    - kubectl get deployments -l app=${CI_ENVIRONMENT_SLUG}
+    - kubectl apply -f deployment.yaml
+    - kubectl apply -f service.yaml || true
+    - kubectl apply -f ingress.yaml