diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f339ce82aa359f5f65097a3f3b24b5067c19700b..af97b6e3e69a4a0c7e694ec1d9d8a18e36abc0c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,17 +1,22 @@
-image: registry.uninett.no/system/docker-builder:1.13.1-uninett7
+include:
+  - project: 'asm/gitlab-ci-helpers'
+    file: '/gitlab-ci-helpers.yml'
+
+stages:
+  - build
 
 development:
-  stage: deploy
-  script:
-    - docker build -t "registry.uninett.no/$CI_PROJECT_PATH:latest" .
-    - docker push "registry.uninett.no/$CI_PROJECT_PATH:latest"
+  extends: .docker-build
+  stage: build
+  variables:
+    CI_REGISTRY_TAG: latest
   only:
     - master
 
 stable:
-  stage: deploy
-  script:
-    - docker build -t "registry.uninett.no/$CI_PROJECT_PATH:$CI_BUILD_REF_NAME" .
-    - docker push "registry.uninett.no/$CI_PROJECT_PATH:$CI_BUILD_REF_NAME"
+  extends: .docker-build
+  stage: build
+  variables:
+    CI_REGISTRY_TAG: $CI_COMMIT_REF_NAME
   only:
     - tags