diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ae2e71..1e26246 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,21 +5,27 @@ image: docker:latest
 services:
   - docker:dind
 
+stages:
+- build
+
+variables:
+  IMAGE_TAG: erichardson/py-eagle-mqtt:$CI_COMMIT_TAG
+
 before_script:
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
 
-build-master:
-  stage: build
-  script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE" ./Docker/
-    - docker push "$CI_REGISTRY_IMAGE"
-  only:
-    - master
-
 build:
   stage: build
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
-    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
-  except:
+    - docker build -t $IMAGE_TAG ./Docker/
+    - docker push $IMAGE_TAG
+  only:
     - master
+
+#build:
+#  stage: build
+#  script:
+#    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
+#    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
+#  except:
+#    - master