diff --git a/defaults/main.yml b/defaults/main.yml
index 7eb4ac7..600144a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -27,7 +27,7 @@ certbot_create_standalone_stop_services:
   # - apache
   # - varnish
 
-certbot_install_from_pypi: no
+certbot_install_from_pypi: false
 certbot_pypi_version: latest
 
 # To install from source (on older OSes or if you need a specific or newer
diff --git a/tasks/install-from-pypi.yml b/tasks/install-from-pypi.yml
index 9eb9208..c7f3ce5 100644
--- a/tasks/install-from-pypi.yml
+++ b/tasks/install-from-pypi.yml
@@ -4,7 +4,7 @@
     - certbot_pypi_version == "latest"
   pip:
     name: "{{ item }}"
-    state: latest
+    state: "{{ certbot_pypi_version }}"
   with_items:
     - certbot
     - certbot-nginx