diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d701c2a..71511ef5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -220,6 +220,20 @@ docker:master:dockerhub:
   variables:
     TAG: "$DOCKER_HUB_IMAGE/matrixconduit/matrix-conduit:latest"
 
+docker:tags:gitlab:
+  extends: .docker-shared-settings
+  rules:
+    - if: "$CI_COMMIT_TAG"
+  variables:
+    TAG: "$CI_REGISTRY_IMAGE/matrix-conduit:$CI_COMMIT_TAG"
+
+docker:tags:dockerhub:
+  extends: .docker-shared-settings
+  rules:
+    - if: "$CI_COMMIT_TAG && $DOCKER_HUB"
+  variables:
+    TAG: "$DOCKER_HUB_IMAGE/matrixconduit/matrix-conduit:$CI_COMMIT_TAG"
+
 # --------------------------------------------------------------------- #
 #  Run tests                                                            #
 # --------------------------------------------------------------------- #
@@ -313,3 +327,4 @@ workflow:
     - if: "$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS"
       when: never
     - if: "$CI_COMMIT_BRANCH"
+    - if: "$CI_COMMIT_TAG"