diff --git a/tasks/install-with-package.yml b/tasks/install-with-package.yml
index 10490ff..1c1f921 100644
--- a/tasks/install-with-package.yml
+++ b/tasks/install-with-package.yml
@@ -1,4 +1,9 @@
 ---
+- name: Ensure package repo is present
+  apt_repository:
+    repo: ppa:certbot/certbot
+  when: ansible_distribution == "Ubuntu" or ansible_distribution == "Debian"
+
 - name: Install Certbot.
   package: "name={{ certbot_package }} state=present"
 
diff --git a/vars/Ubuntu-16.04.yml b/vars/Ubuntu-16.04.yml
deleted file mode 100644
index 83cf124..0000000
--- a/vars/Ubuntu-16.04.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-certbot_package: letsencrypt