diff --git a/tasks/debian-stretch-buster.yml b/tasks/debian-not-jessie.yml
similarity index 100%
rename from tasks/debian-stretch-buster.yml
rename to tasks/debian-not-jessie.yml
diff --git a/tasks/main.yml b/tasks/main.yml
index 77b52ae..5bc2598 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -17,9 +17,9 @@
     include: debian-jessie.yml
     when: ansible_distribution == "Debian" and ansible_distribution_release == "jessie"
 
-  - name: install certbot (Debian stretch or buster)
-    include: debian-stretch-buster.yml
-    when: ansible_distribution == "Debian" and (ansible_distribution_release == "stretch" or ansible_distribution_release == "buster")
+  - name: install certbot (Debian stretch or higher)
+    include: debian-not-jessie.yml
+    when: ansible_distribution == "Debian" and ansible_distribution_release != "jessie"
 
   - name: install certbot (Ubuntu Xenial)
     include: ubuntu-xenial.yml