diff --git a/roles/bookstack/defaults/main.yml b/roles/bookstack/defaults/main.yml
index 7288656..5304c80 100644
--- a/roles/bookstack/defaults/main.yml
+++ b/roles/bookstack/defaults/main.yml
@@ -1,11 +1,11 @@
 ---
 
 # Version to deploy
-bookstack_version: '22.07.1'
+bookstack_version: '22.07.2'
 # URL of the arhive
 bookstack_archive_url: https://github.com/BookStackApp/BookStack/archive/v{{ bookstack_version }}.tar.gz
 # Expected sha256 of the archive
-bookstack_archive_sha256: 242a75303612961efce381be5481e36f1cc07e4ef700dd72e865f35253eb5beb
+bookstack_archive_sha256: 3f62df83138170ee67ea7a15cb23aaa440c1fc261c9596271cf37c69f32823e0
 
 # Should ansible handle bookstack upgrades or just the inintial install
 bookstack_manage_upgrade: True
diff --git a/roles/consul/defaults/main.yml b/roles/consul/defaults/main.yml
index a1d976c..4fc8e44 100644
--- a/roles/consul/defaults/main.yml
+++ b/roles/consul/defaults/main.yml
@@ -42,7 +42,7 @@ consul_base_conf:
   # datacenter: dc1
 
   # Node name, which should be uniq in the region. Default is the hostname
-  # node_name: nomade-fr-zone-c
+  # node_name: consule-fr-zone-c
 
   # Arbitrary metadata
   # node_meta:
@@ -57,10 +57,10 @@ consul_base_conf:
   retry_join: "{{ consul_servers }}"
   bootstrap_expect: "{{ consul_servers | length }}"
 
-  server: "{{ (inventory_hostname in consul_servers) | ternary(True, False) }}"
+  server: "{{ (inventory_hostname in consul_servers | map('regex_replace', ':\\d+$', '')) | ternary(True, False) }}"
 
   ui_config:
-    enabled: "{{ (inventory_hostname in consul_servers) | ternary(True, False) }}"
+    enabled: "{{ (inventory_hostname in consul_servers | map('regex_replace', ':\\d+$', '')) | ternary(True, False) }}"
 
   performance:
     raft_multiplier: 1
@@ -69,7 +69,7 @@ consul_base_conf:
     prometheus_retention_time: 1h
 
   connect:
-    enabled: False
+    enabled: "{{ (inventory_hostname in consul_servers | map('regex_replace', ':\\d+$', '')) | ternary(True, False) }}"
 
 consul_extra_conf: {}
 consul_host_conf: {}