diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dbedc3e5394ee2c1ff453c9947c916d6e8cdf5aa..b0660749aaf8a0dd2fb780ba57d156bc1e64c985 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,7 @@ build-master:
     expire_in: 1 hrs
   only:
     - master
+    - tags
   environment:
     name: staging
 
@@ -55,8 +56,6 @@ test-and-deploy-master:
   only:
     - tags
     - master
-  except:
-    - branches
   artifacts:
     paths:
       - build/*