diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 13a8aad..ba1c416 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ variables:
   DOCKER_HOST: tcp://docker:2375/
   DOCKER_DRIVER: overlay2
 
-build-base:
+build-base-master:
   stage: Base
   artifacts:
     expire_in: 3 days
@@ -19,6 +19,8 @@ build-base:
       - ./images/
   except:
     - pushes
+  only:
+    - master
   tags:
     - docker
   before_script:
@@ -30,16 +32,53 @@ build-base:
     #- docker push "$CI_REGISTRY_IMAGE:$GRAV_VERSION"
     - docker save --output "./images/$CI_REGISTRY_IMAGE_$CI_COMMIT_SHORT_SHA.tar" "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA"
 
-build-git:
+build-git-master:
   stage: Variants
   dependencies:
     - build-base
   except:
     - pushes
+  only:
+    - master
   tags:
     - docker
   before_script:
     - docker load --input "./images/$CI_REGISTRY_IMAGE_$CI_COMMIT_SHORT_SHA.tar"
   script:
     - docker build --build-arg "CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA" -f ./variants/Dockerfile-git -t "$CI_REGISTRY_IMAGE:$GRAV_VERSION-git" .
-    #- docker push "$CI_REGISTRY_IMAGE:$GRAV_VERSION-git"
\ No newline at end of file
+    #- docker push "$CI_REGISTRY_IMAGE:$GRAV_VERSION-git"
+
+build-base:
+  stage: Base
+  artifacts:
+    expire_in: 3 days
+    paths:
+      - ./images/
+  except:
+    - master
+    - pushes
+  tags:
+    - docker
+  before_script:
+    - docker info
+    - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin
+    - mkdir ./images
+  script:
+    - docker build --pull --build-arg "GRAV_VERSION=$GRAV_VERSION" -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" -t "$CI_REGISTRY_IMAGE:$GRAV_VERSION.$CI_COMMIT_REF_NAME" .
+    #- docker push "$CI_REGISTRY_IMAGE:$GRAV_VERSION.$CI_COMMIT_REF_NAME"
+    - docker save --output "./images/$CI_REGISTRY_IMAGE_$CI_COMMIT_SHORT_SHA.tar" "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA"
+
+build-git:
+  stage: Variants
+  dependencies:
+    - build-base
+  except:
+    - master
+    - pushes
+  tags:
+    - docker
+  before_script:
+    - docker load --input "./images/$CI_REGISTRY_IMAGE_$CI_COMMIT_SHORT_SHA.tar"
+  script:
+    - docker build --build-arg "CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA" -f ./variants/Dockerfile-git -t "$CI_REGISTRY_IMAGE:$GRAV_VERSION-git.$CI_COMMIT_REF_NAME" .
+    #- docker push "$CI_REGISTRY_IMAGE:$GRAV_VERSION-git.$CI_COMMIT_REF_NAME"
\ No newline at end of file