diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 98964e7d07e6b574bd8b4fc24f57fd0b156207d9..7c5f56dccfdad92408b6c6f9a01713a0daa1ed51 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,23 @@
 stages:
   - build
   - push
+  - push
+
 build:
   stage: build
   script:
     - docker build -t registry.faked.org/gitlab-ci/android:latest .
-push:
+
+push_latest:
   stage: push
+  only:
+    - master
   script:
     - docker push registry.faked.org/gitlab-ci/android:latest
 
+push_tag:
+  stage: push
+  only:
+    - tags
+  script:
+    - docker push registry.faked.org/gitlab-ci/android:${CI_COMMIT_TAG}