diff --git a/app/functions.sh b/app/functions.sh
index bec4664e..612e5da5 100644
--- a/app/functions.sh
+++ b/app/functions.sh
@@ -53,7 +53,7 @@ function ascending_wildcard_locations {
     # - *.example.com
     local domain="${1:?}"
     local first_label
-    regex="^[[:alnum:]_\-]+(\.[[:alpha:]]+)?$"
+    regex="^(\*\.)?[[:alnum:]_\-]+(\.[[:alpha:]]+)?$"
     until [[ "$domain" =~ $regex ]]; do
       first_label="${domain%%.*}"
       domain="${domain/${first_label}./}"
@@ -73,7 +73,7 @@ function descending_wildcard_locations {
     # - foo.*
     local domain="${1:?}"
     local last_label
-    regex="^[[:alnum:]_\-]+$"
+    regex="^(\*\.)?[[:alnum:]_\-]+$"
     until [[ "$domain" =~ $regex ]]; do
       last_label="${domain##*.}"
       domain="${domain/.${last_label}/}"
diff --git a/app/letsencrypt_service b/app/letsencrypt_service
index bac881a9..4ce3f6b5 100755
--- a/app/letsencrypt_service
+++ b/app/letsencrypt_service
@@ -149,7 +149,7 @@ function update_cert {
 
     # CLI parameters array used for --issue
     local -a params_issue_arr
-    params_issue_arr+=(--webroot /usr/share/nginx/html)
+    [[ -z "${CF_Token}" ]] && params_issue_arr+=(--webroot /usr/share/nginx/html) || params_issue_arr+=(--dns dns_cf)
 
     local -n cert_keysize="LETSENCRYPT_${cid}_KEYSIZE"
     if [[ -z "$cert_keysize" ]] || \