diff --git a/roles/nginx-proxy/tasks/generate_certs.yml b/roles/nginx-proxy/tasks/generate_certs.yml
index 60a0502..d2d7d12 100644
--- a/roles/nginx-proxy/tasks/generate_certs.yml
+++ b/roles/nginx-proxy/tasks/generate_certs.yml
@@ -1,23 +1,13 @@
 ---
-- name: Stop Nginx before Certbot (if it is running)
-  ansible.builtin.service:
-    name: nginx
-    state: stopped
-  ignore_errors: true
-
 - name: Generate Certbot certificates
   ansible.builtin.command: >
-    certbot certonly --standalone
+    certbot --nginx
     --non-interactive
     --agree-tos
+    --redirect
     {{ '--dry-run' if bool_cert_dry_run | default(true) else '' }}
     --email {{ certbot_email | default("admin@" + mydomain) }}
     -d {{ item.key + "." + mydomain if not item.value.internal else item.key + ".internal." + mydomain }}
   loop: "{{ servernames | dict2items }}"
   args:
     creates: "/etc/letsencrypt/live/{{ (item.key ~ '.' ~ mydomain) if not item.value.internal else (item.key ~ '.internal.' ~ mydomain) }}/fullchain.pem"
-
-- name: Start Nginx after Certbot
-  ansible.builtin.service:
-    name: nginx
-    state: started
diff --git a/roles/nginx-proxy/tasks/main.yml b/roles/nginx-proxy/tasks/main.yml
index 82e544e..c501cad 100644
--- a/roles/nginx-proxy/tasks/main.yml
+++ b/roles/nginx-proxy/tasks/main.yml
@@ -7,11 +7,11 @@
   ansible.builtin.include_tasks:
     file: install_certbot.yml
 
-- name: Include Generate Certs tasks
-  ansible.builtin.include_tasks:
-    file: generate_certs.yml
-
 - name: Include Create Vhosts tasks
   ansible.builtin.include_tasks:
     file: create_vhosts.yml
   when: bool_create_vhost | default(true)
+
+- name: Include Generate Certs tasks
+  ansible.builtin.include_tasks:
+    file: generate_certs.yml