diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e8a6b3c..87ea11e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -93,7 +93,12 @@ docker:
   dependencies:
     - release
   script:
-    - 'docker -H unix:///var/run/docker.sock image build ./'
+    # Build the image
+    - 'docker -H unix:///var/run/docker.sock image build -t chaosbot:$CI_COMMIT_SHA ./'
+    # Tag the image with a registry tag
+    - 'docker -H unix:///var/run/docker.sock image tag chaosbot:$CI_COMMIT_SHA registry.chaoticlogic.us/chaosbot:$CI_COMMIT_SHA'
+    - 'docker -H unix:///var/run/docker.sock image tag chaosbot:$CI_COMMIT_SHA registry.chaoticlogic.us/chaosbot:latest'
+    # Push the registry images
     - 'docker -H unix:///var/run/docker.sock image push registry.chaoticlogic.us/chaosbot:$CI_COMMIT_SHA'
     - 'docker -H unix:///var/run/docker.sock image push registry.chaoticlogic.us/chaosbot:latest'