diff --git a/roles/acme/certificate/defaults/main.yml b/roles/acme/certificate/defaults/main.yml
index 9efb9e6..979c6c6 100644
--- a/roles/acme/certificate/defaults/main.yml
+++ b/roles/acme/certificate/defaults/main.yml
@@ -5,6 +5,8 @@ domain: "{{ domains[0] }}"
 domains:
   - "{{ domain }}"
 
+acme_must_staple: yes
+
 certificate_name: "{{ domain }}"
 
 # acme_validation_root_directory from nginx/application
diff --git a/roles/acme/certificate/tasks/main.yml b/roles/acme/certificate/tasks/main.yml
index 6c3c0c8..052ef7a 100644
--- a/roles/acme/certificate/tasks/main.yml
+++ b/roles/acme/certificate/tasks/main.yml
@@ -6,7 +6,7 @@
       certbot certonly
       --non-interactive
       --cert-name {{ certificate_name | quote }}
-      --must-staple
+      {% if acme_must_staple %}--must-staple{% endif %}
       --disable-hook-validation
       --post-hook {{ ( '(' + (all_reload_commands | join(') && (')) + ')' ) | quote }}
       {% for d in domains %}