diff --git a/tasks/buildcerts.yml b/tasks/buildcerts.yml
index 0a453a2da32cf8530d5a996efad4f05b532ff924..84a1325438f08509bac7dd2e3cc4f483063a5c33 100644
--- a/tasks/buildcerts.yml
+++ b/tasks/buildcerts.yml
@@ -6,7 +6,7 @@
     src='/etc/letsencrypt/live/{{ item.domain }}'
     dest='/etc/haproxy/certs/{{ item.domain }}.pem'
     regexp='(fullchain)|(privkey)\.pem'
-  with_items: '{{ proxy_certificates_letsencrypt|default([]) }}'
-  when: item.active|default(true)
+  with_items: '{{ proxy_certificates|default([]) }}'
+  when: item.letsencrypt|default(false) and item.active|default(true)
   notify:
     - "Restart HAProxy"
diff --git a/tasks/main.yml b/tasks/main.yml
index 1eb909181890036e2a22ac8b60964f7afc4cfac0..638f00bc76d4ff78bdbabcc66d3b767ab5e6875b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -17,10 +17,10 @@
 
   - name: "Install Certs"
     include: '../../letsencrypt/tasks/cert.yml'
-    with_items: '{{ proxy_certificates_letsencrypt|default([]) }}'
+    with_items: '{{ proxy_certificates|default([]) }}'
     loop_control:
       loop_var: domain
-    when: domain.active|default(true)
+    when: domain.letsencrypt|default(false) and domain.active|default(true)
 
   - name: "Renew Existing Cert"
     include: '../../letsencrypt/tasks/renew.yml'