diff --git a/ponyconf.yml b/ponyconf.yml
index 82e92e6..d6e1cec 100644
--- a/ponyconf.yml
+++ b/ponyconf.yml
@@ -99,6 +99,12 @@
         dest: "{{ ponyconf_home }}/src/"
       notify: restart ponyconf
 
+    - name: Setup or upgrade venv
+      become: true
+      become_user: "{{ ponyconf_user }}"
+      command: python3 -m venv --upgrade-deps "{{ ponyconf_home }}/venv/"
+      changed_when: False
+
     - name: Setup PonyConf venv
       become: true
       become_user: "{{ ponyconf_user }}"
diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml
index e6943c5..03e1fb5 100644
--- a/roles/nginx/tasks/main.yml
+++ b/roles/nginx/tasks/main.yml
@@ -29,6 +29,7 @@
       - "certbot<2"  # See https://github.com/certbot/certbot/issues/9485
       - "acme<2"  # See https://github.com/certbot/certbot/issues/9485
       - "certbot-plugin-gandi"
+      - "certbot-nginx"  # In case there's a "certbot_authenticator == 'nginx'"
 
 - name: Setup Gandi credentials
   copy: