diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fca78ce4bd6fa40c861db6e828181107aa5947dc..cbbcc2ade7a631da36cbfa2746a3b9ab5050e176 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,12 @@
 cache:
   paths:
   - .rebar3
-  - ~/.docker
 
 before_script:
   - export GOROOT=${GO_HOME}
   - export GOPATH=${CI_PROJECT_DIR}/_build/go
   - export PATH=${ERL_HOME}/bin:${GOPATH}/bin:${GOROOT}/bin:$PATH
   - mkdir -p ${GOPATH}
-  - env | sort
   - docker info
   - rebar3 update
 
@@ -40,7 +38,7 @@ build:
       - _build/VERSION
       - _build/production/rel/consul_proxy/consul_proxy-*.tar.gz
 
-scripts_x86:
+scripts:
   stage: build
   only:
     - master
@@ -48,77 +46,34 @@ scripts_x86:
   script:
     - make genpasswd
     - make consul-backup
-    - mv _build/consul-backup _build/consul-backup_x86
-    - mv _build/genpasswd _build/genpasswd_x86
+    - mv _build/consul-backup _build/consul-backup
+    - mv _build/genpasswd _build/genpasswd
   artifacts:
     paths:
-      - _build/consul-backup_x86
-      - _build/genpasswd_x86
-  tags:
-    - x86_64
-
-scripts_arm:
-  stage: build
-  only:
-    - master
-    - production
-  script:
-    - make genpasswd
-    - make consul-backup
-    - mv _build/consul-backup _build/consul-backup_arm
-    - mv _build/genpasswd _build/genpasswd_arm
-  artifacts:
-    paths:
-      - _build/consul-backup_arm
-      - _build/genpasswd_arm
-  tags:
-    - armv7l
+      - _build/consul-backup
+      - _build/genpasswd
 
 aws_s3:
   stage: deploy
   only:
     - production
   script:
-    - aws s3 cp _build/consul-backup_x86 s3://s3.erlang.ninja/consul_proxy/extras/x86/consul-backup
-    - aws s3 cp _build/consul-backup_arm s3://s3.erlang.ninja/consul_proxy/extras/arm/consul-backup
-    - aws s3 cp _build/genpasswd_x86 s3://s3.erlang.ninja/consul_proxy/extras/x86/genpasswd
-    - aws s3 cp _build/genpasswd_arm s3://s3.erlang.ninja/consul_proxy/extras/arm/genpasswd
+    - aws s3 cp _build/consul-backup s3://s3.erlang.ninja/consul_proxy/extras/consul-backup
+    - aws s3 cp _build/genpasswd s3://s3.erlang.ninja/consul_proxy/extras/genpasswd
     - aws s3 cp _build/edoc s3://s3.erlang.ninja/consul_proxy/$(cat _build/VERSION)/ --recursive
     - aws s3 cp _build/production/rel/consul_proxy/consul_proxy-$(cat _build/VERSION).tar.gz s3://s3.erlang.ninja/consul_proxy/
 
-docker_x86:
-  stage: deploy
-  only:
-    - production
-  script:
-    - export PLATFORM=x86
-    - export REL_VSN=$(cat _build/VERSION)
-    - envsubst '$PLATFORM:$REL_VSN' < apps/consul_proxy/priv/Dockerfile > _build/production/Dockerfile
-    - docker build -t erlangninja/consul_proxy:${PLATFORM} -f _build/production/Dockerfile _build/production
-    - docker tag -f erlangninja/consul_proxy:${PLATFORM} erlangninja/consul_proxy:${REL_VSN}-${PLATFORM}
-    - if [ ! -f ~/.docker/config.json ]; then docker login --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD --email=$DOCKER_HUB_EMAIL; fi
-    - docker push erlangninja/consul_proxy:${PLATFORM}
-    - docker push erlangninja/consul_proxy:${REL_VSN}-${PLATFORM}
-  tags:
-    - docker
-    - x86_64
-
-docker_arm:
+docker:
   stage: deploy
   only:
     - production
   script:
-    - export PLATFORM=arm
     - export REL_VSN=$(cat _build/VERSION)
-    - envsubst '$PLATFORM:$REL_VSN' < apps/consul_proxy/priv/Dockerfile > _build/production/Dockerfile
-    - docker build -t erlangninja/consul_proxy:${PLATFORM} -f _build/production/Dockerfile _build/production
-    - docker tag -f erlangninja/consul_proxy:${PLATFORM} erlangninja/consul_proxy:${REL_VSN}-${PLATFORM}
-    - if [ ! -f ~/.docker/config.json ]; then docker login --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD --email=$DOCKER_HUB_EMAIL; fi
-    - docker push erlangninja/consul_proxy:${PLATFORM}
-    - docker push erlangninja/consul_proxy:${REL_VSN}-${PLATFORM}
-  tags:
-    - docker
-    - armv7l
+    - envsubst '$REL_VSN' < apps/consul_proxy/priv/Dockerfile > _build/production/Dockerfile
+    - docker build -t ${DOCKER_HUB_REPO} -f _build/production/Dockerfile _build/production
+    - docker tag ${DOCKER_HUB_REPO} ${DOCKER_HUB_REPO}:${REL_VSN}
+    - docker login --username=${DOCKER_HUB_USERNAME} --password=${DOCKER_HUB_PASSWORD}
+    - docker push ${DOCKER_HUB_REPO}
 
 trigger:
   stage: trigger
diff --git a/apps/consul_proxy/priv/Dockerfile b/apps/consul_proxy/priv/Dockerfile
index 1fce29bb4adff7c31eadf0478a73aa16d0c46ae7..4f71a61cb85c9fb5bc5c36afa641fd87ab0d6c32 100644
--- a/apps/consul_proxy/priv/Dockerfile
+++ b/apps/consul_proxy/priv/Dockerfile
@@ -1,4 +1,4 @@
-FROM        ehedenst/erlang:${PLATFORM}
+FROM        hedenstroem/erlang
 MAINTAINER  Erik Hedenström <erik@erlang.ninja>
 
 ENV NAME_PREFIX consul_proxy