diff --git a/tasks/main.yml b/tasks/main.yml
index ae06d61..00791d0 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -100,12 +100,12 @@
 - name: set amce server url
   set_fact:
     acmeshserver: "--server {{ acme_sh_server }} --insecure --force --days 10"
-  when: acme_sh_server is defined
+  when: acme_sh_server is defined and use_local_ca != false
 
 - name: set amce server url
   set_fact:
     acmeshserver: ""
-  when: not acme_sh_server is defined
+  when: acme_sh_server is undefined or use_local_ca == false
   
 - name: generate /etc/apache2/sites-available/{{ domainname }}.conf
   template: