diff --git a/roles/archweb/defaults/main.yml b/roles/archweb/defaults/main.yml
index 16aa4dda1d5cdc6fda54efa88fc501513dd7540f..273a93c5504da606274e252652a2b82249407fb9 100644
--- a/roles/archweb/defaults/main.yml
+++ b/roles/archweb/defaults/main.yml
@@ -13,7 +13,7 @@ archweb_domains_templates:
 archweb_allowed_hosts: ["{{ archweb_domain }}", 'ipxe.archlinux.org']
 archweb_nginx_conf: '/etc/nginx/nginx.d/archweb.conf'
 archweb_repository: 'https://github.com/archlinux/archweb.git'
-archweb_version: 'release_2021-06-20'
+archweb_version: 'release_2021-06-23'
 archweb_pgp_key: ['E499C79F53C96A54E572FEE1C06086337C50773E']
 archweb_site: true
 archweb_mirrorcheck: false
diff --git a/roles/archweb/tasks/main.yml b/roles/archweb/tasks/main.yml
index 2740bf1850ab384f1934daa8a4c9e747fc49e0ae..c90027baab0f6ebc8b0364a25c56c957145898de 100644
--- a/roles/archweb/tasks/main.yml
+++ b/roles/archweb/tasks/main.yml
@@ -28,6 +28,7 @@
     name: certificate
   vars:
     domains: "{{ [archweb_domain] + archweb_alternate_domains }}"
+  when: archweb_site|bool and maintenance is not defined
 
 - name: set up nginx
   template: src=nginx.d.conf.j2 dest="{{ archweb_nginx_conf }}" owner=root group=root mode=644