diff --git a/circle.yml b/circle.yml
index 9e8a94b3..e1cfad9f 100644
--- a/circle.yml
+++ b/circle.yml
@@ -7,8 +7,14 @@ deployment:
     branch: master
     commands:
     - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
-    - docker build . -t mozilla/portal:latest
-    - docker push mozilla/portal:latest
+    - docker build . -t mozilla/fileshare:latest
+    - docker push mozilla/fileshare:latest
+  tags:
+    tags: /.*/
+    commands:
+    - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
+    - docker build . -t mozilla/fileshare:$CIRCLE_TAG
+    - docker push mozilla/fileshare:$CIRCLE_TAG
 
 test:
   override: