diff --git a/tasks/cert_generate.yml b/tasks/cert_generate.yml
index 9714e5564a4d92ef8a19440db3bd135fc984bd16..022890fabe7bf4237683ec147f1673e6bbe6db2b 100644
--- a/tasks/cert_generate.yml
+++ b/tasks/cert_generate.yml
@@ -17,7 +17,8 @@
       protocol: tcp
       jump: ACCEPT
       state: present
-    when: groups.proxyserver is defined and inventory_hostname in groups.proxyserver
+    #when: groups.proxyserver is defined and inventory_hostname in groups.proxyserver
+    when: no
 
   - name: Install New Cert via webroot
     shell: certbot certonly --expand --non-interactive --config /etc/letsencrypt/{{ cert.domain }}.ini --cert-name {{ cert.domain }} --webroot-path /var/www/html --webroot
@@ -37,7 +38,8 @@
       protocol: tcp
       jump: ACCEPT
       state: absent
-    when: groups.proxyserver is defined and inventory_hostname in groups.proxyserver
+    #when: groups.proxyserver is defined and inventory_hostname in groups.proxyserver
+    when: no
 
   - include_tasks: cert_deploy.yml
 
diff --git a/tasks/renew.yml b/tasks/renew.yml
index a91b0b9f3975fb0021cc6f699d6d311c21dfc55c..d1936beb8356ca2cf30f6ccabd5a668c1f0e5186 100644
--- a/tasks/renew.yml
+++ b/tasks/renew.yml
@@ -19,7 +19,8 @@
     protocol: tcp
     jump: ACCEPT
     state: present
-  when: groups.proxyserver is defined and inventory_hostname in groups.proxyserver
+  #when: groups.proxyserver is defined and inventory_hostname in groups.proxyserver
+  when: no
 
 - name: Renew Existing Certs via webroot
   shell: certbot renew --non-interactive --webroot-path /var/www/html --webroot
@@ -43,7 +44,8 @@
     protocol: tcp
     jump: ACCEPT
     state: absent
-  when: groups.proxyserver is defined and inventory_hostname in groups.proxyserver
+  #when: groups.proxyserver is defined and inventory_hostname in groups.proxyserver
+  when: no
 
 - include_tasks: cert_deploy.yml
   with_items: '{{ letsencrypt_certificates|default([]) }}'