diff --git a/.travis.yml b/.travis.yml
index 5d9cd8cc8..cec6f4de9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -71,12 +71,12 @@ after_success:
 
       git clone "https://${TRAVIS_SECURE_TOKEN}@github.com/datacite/mastino.git";
       ./dockerize -template vendor/docker/_lupo.auto.tfvars.tmpl:mastino/stage/services/client-api/_lupo.auto.tfvars;
-      ./dockerize -template vendor/docker/_lupo.auto.tfvars.tmpl:mastino/test/services/client-api/_lupo.auto.tfvars;
         
       sentry-cli releases new lupo:${GIT_TAG} --finalize --project lupo;
 
       if [ "${TRAVIS_TAG?}" ]; then
         ./dockerize -template vendor/docker/_lupo.auto.tfvars.tmpl:mastino/prod-eu-west/services/client-api/_lupo.auto.tfvars;
+        ./dockerize -template vendor/docker/_lupo.auto.tfvars.tmpl:mastino/test/services/client-api/_lupo.auto.tfvars;
         sentry-cli releases deploys lupo:${GIT_TAG} new -e production;
       else
         sentry-cli releases deploys lupo:${GIT_TAG} new -e stage;
@@ -91,10 +91,10 @@ after_success:
       
       if [ "${TRAVIS_TAG?}" ]; then
         git add prod-eu-west/services/client-api/_lupo.auto.tfvars;
+        git add test/services/client-api/_lupo.auto.tfvars;
         git commit -m "Adding lupo git variables for commit tagged ${TRAVIS_TAG?}";
         git push "https://${TRAVIS_SECURE_TOKEN}@github.com/datacite/mastino.git" master;
       else
-        git add test/services/client-api/_lupo.auto.tfvars;
         git add stage/services/client-api/_lupo.auto.tfvars;
         git commit -m "Adding lupo git variables for latest commit";
         git push "https://${TRAVIS_SECURE_TOKEN}@github.com/datacite/mastino.git" master;