diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74dc976..20f0fa2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,11 +23,8 @@ build_master:
   <<: *docker_build
   script:
     - *docker_login
-    - docker build --pull -t "$IMAGE_NAME" .
+    - docker build --pull -t "$IMAGE_NAME" -t "$IMAGE_NAME_DOCKERHUB" .
     - docker push "$IMAGE_NAME"
-    - *dockerhub_login
-    - docker tag "$IMAGE_NAME" "$IMAGE_NAME_DOCKERHUB"
-    - docker push "$IMAGE_NAME_DOCKERHUB"
   only:
     - master
 
@@ -35,10 +32,10 @@ build_master_rpi3:
   <<: *docker_build
   script:
     - *docker_login
-    - docker build --pull -t "$IMAGE_NAME:rpi3" .
+    - docker build --pull -t "$IMAGE_NAME:rpi3" -t "$IMAGE_NAME_DOCKERHUB:rpi3" .
     - docker push "$IMAGE_NAME:rpi3"
+      # dockerhub can't autobuild for arm - so push this build to dockerhub
     - *dockerhub_login
-    - docker tag "$IMAGE_NAME:rpi3" "$IMAGE_NAME_DOCKERHUB:rpi3"
     - docker push "$IMAGE_NAME_DOCKERHUB:rpi3"
   tags:
     - rpi3
@@ -49,10 +46,8 @@ build:
   <<: *docker_build
   script:
     - *docker_login
-    - docker build --pull -t "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/bw_backup" -t "$IMAGE_NAME_DOCKERHUB:$CI_COMMIT_REF_SLUG" .
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/bw_backup" .
     - docker push "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/bw_backup"
-    - *dockerhub_login
-    - docker push "$IMAGE_NAME_DOCKERHUB:$CI_COMMIT_REF_SLUG"
   except:
     - master