diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8045c5f..590491b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 # This file is a template, and might need editing before it works on your project.
 docker-build-main:
-  # Official docker image.
+  # Official docker image, develop tag
   image: docker:latest
   stage: build
   services:
@@ -8,13 +8,16 @@ docker-build-main:
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE" .
-    - docker push "$CI_REGISTRY_IMAGE"
-  only:
-    - main
+    - docker build --pull -t "$CI_REGISTRY_IMAGE:develop" .
+    - docker push "$CI_REGISTRY_IMAGE:develop"
+  rules:
+    - if: $CI_COMMIT_BRANCH != "main"
+      when: never
+    - if: $CI_COMMIT_TAG == null
+      when: on_success
 
-docker-build:
-  # Official docker image.
+docker-build-tag:
+  # Official docker image, tagged release (also updates latest)
   image: docker:latest
   stage: build
   services:
@@ -22,7 +25,10 @@ docker-build:
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
-    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
-  except:
-    - main
\ No newline at end of file
+    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" -t "$CI_REGISTRY_IMAGE" .
+    - docker push --all-tags "$CI_REGISTRY_IMAGE"
+  rules:
+    - if: $CI_COMMIT_BRANCH != "main"
+      when: never
+    - if: $CI_COMMIT_TAG
+      when: on_success
\ No newline at end of file