diff --git a/tasks/main.yml b/tasks/main.yml
index 50642137d81c7b46aae09ff451d674c1d51651ff..d659b6715bbb5a070673077dd072e047ef992020 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -18,7 +18,7 @@
     register: letsencrypt_certs_available
     failed_when: false
     changed_when: false
-    tags: 'always'
+    tags: 'renew'
 
   - import_tasks: install.yml
 
diff --git a/tasks/renew.yml b/tasks/renew.yml
index 31d5e1853e47e90c82091aecb0665937591f6a7e..702d104782d675a586c2501b0d88629d838f0e26 100644
--- a/tasks/renew.yml
+++ b/tasks/renew.yml
@@ -40,7 +40,6 @@
 
 - name: "Build HaProxy Certs"
   import_tasks: '../../haproxy/tasks/buildcerts.yml'
-  tags: 'always'
 
 - name: "Start services"
   service: