diff --git a/roles/pbs/defaults/main.yml b/roles/pbs/defaults/main.yml
index 8840e97..af238c1 100644
--- a/roles/pbs/defaults/main.yml
+++ b/roles/pbs/defaults/main.yml
@@ -3,5 +3,5 @@
 # This control access on port 8007. Note that the port is not configurable
 pbs_src_ip: []
 
-# If pbs_letsencrypt_cert can be defined to the name of dehydrated (Let's Encrypt) cert
-# letsencrypt_cert: pbs.example.org
+# pbs_letsencrypt_cert can be defined to the name of dehydrated (Let's Encrypt) cert
+# pbs_letsencrypt_cert: pbs.example.org
diff --git a/roles/pbs/tasks/iptables.yml b/roles/pbs/tasks/iptables.yml
index 392f727..6bc7c86 100644
--- a/roles/pbs/tasks/iptables.yml
+++ b/roles/pbs/tasks/iptables.yml
@@ -5,6 +5,5 @@
     name: pbs_port
     state: "{{ (pbs_src_ip | length > 0) | ternary('present', 'absent') }}"
     rules: "-A INPUT -m state --state NEW -p tcp --dport 8007 -s {{ pbs_src_ip | flatten | join(',') }} -j ACCEPT"
-  when: iptables_manage | default(True)
   tags: pbs,firewall
 
diff --git a/roles/pbs/tasks/main.yml b/roles/pbs/tasks/main.yml
index b721cb5..f85ab24 100644
--- a/roles/pbs/tasks/main.yml
+++ b/roles/pbs/tasks/main.yml
@@ -2,4 +2,5 @@
 
 - include: install.yml
 - include: iptables.yml
+  when: iptables_manage | default(True)
 - include: services.yml
diff --git a/roles/repo_pbs/tasks/main.yml b/roles/repo_pbs/tasks/main.yml
index 52edbde..2c979e2 100644
--- a/roles/repo_pbs/tasks/main.yml
+++ b/roles/repo_pbs/tasks/main.yml
@@ -2,7 +2,7 @@
 
 - name: Add PBS repo key
   apt_key:
-    url: http://download.proxmox.com/debian/proxmox-ve-release-6.x.gpg
+    url: https://enterprise.proxmox.com/debian/proxmox-{{ ansible_distribution_major_version is version('11', '>=') | ternary('release-' ~ ansible_distribution_release, 've-release-6.x.gpg') }}.gpg
   environment:
     https_proxy: "{{ system_proxy | default('') }}"
   tags: repo
diff --git a/roles/squid/files/acl/software_various.domains b/roles/squid/files/acl/software_various.domains
index 58049bb..5203069 100644
--- a/roles/squid/files/acl/software_various.domains
+++ b/roles/squid/files/acl/software_various.domains
@@ -182,6 +182,7 @@ debian.fusioninventory.org
 
 # Proxmox
 download.proxmox.com
+enterprise.proxmox.com
 
 # Bluemind
 pkg.bluemind.net