diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6948289..447a5ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,19 +3,30 @@ services:
   - docker:dind
 
 stages:
-  - build
+  - build_latest
+  - build_tags
 
 before_script:
   - echo Logging in to $CI_REGISTRY...
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   - docker info | grep Registry
 
-build:
-  stage: build
+build_latest:
+  stage: build_latest
   script:
     - echo Build started on `date` for $CI_COMMIT_REF_NAME
-    - if [[ "$CI_COMMIT_REF_NAME" =~ "master" ]]; then export build=latest; else export build=$CI_COMMIT_REF_NAME; fi
-    - docker build -t richarvey/nginx-php-fpm:"$build" .
-    - docker info | grep Registry
+    - docker build -t richarvey/nginx-php-fpm:latest .
     - docker images
-    - docker push "$CI_REGISTRY_IMAGE":"$build"
+    - docker push "$CI_REGISTRY_IMAGE":latest
+  only:
+    - master
+
+build_tags:
+  stage: build_tags
+  script:
+    - echo Build started on `date` for $CI_COMMIT_REF_NAME
+    - docker build -t richarvey/nginx-php-fpm:"$CI_COMMIT_REF_NAME" .
+    - docker images
+    - docker push "$CI_REGISTRY_IMAGE":"$CI_COMMIT_REF_NAME"
+  only:
+    - tags