diff --git a/roles/bookstack/defaults/main.yml b/roles/bookstack/defaults/main.yml
index 60ad8d5..db545bb 100644
--- a/roles/bookstack/defaults/main.yml
+++ b/roles/bookstack/defaults/main.yml
@@ -1,11 +1,11 @@
 ---
 
 # Version to deploy
-bookstack_version: 21.08.4
+bookstack_version: 21.08.5
 # URL of the arhive
 bookstack_archive_url: https://github.com/BookStackApp/BookStack/archive/v{{ bookstack_version }}.tar.gz
 # Expected sha1 of the archive
-bookstack_archive_sha1: 3dd16d716344622ef539278d411808eceabbb301
+bookstack_archive_sha1: 6b6badcf0c5b12676ba1804ac9723bd85756ed26
 
 # Should ansible handle bookstack upgrades or just the inintial install
 bookstack_manage_upgrade: True
diff --git a/roles/diagrams/defaults/main.yml b/roles/diagrams/defaults/main.yml
index 80e495a..b54f868 100644
--- a/roles/diagrams/defaults/main.yml
+++ b/roles/diagrams/defaults/main.yml
@@ -1,11 +1,11 @@
 ---
 
 # Veresion of diagrams to deploy
-diagrams_version: 15.4.1
+diagrams_version: 15.5.0
 # URL of the WAR file to deploy
 diagrams_war_url: https://github.com/jgraph/drawio/releases/download/v{{ diagrams_version }}/draw.war
 # Expected sha1 of the WAR file
-diagrams_war_sha1: 6e1a6a059362d8608921bef15a7cc6737de0d179
+diagrams_war_sha1: f90e87ab2ab4fce77c2c5d68ea7d997b5a55de66
 # root directory of the installation
 diagrams_root_dir: /opt/diagrams
 # Should ansible manage upgrades, or just initial install ?
diff --git a/roles/pgadmin4/defaults/main.yml b/roles/pgadmin4/defaults/main.yml
index d031d9a..b349fe8 100644
--- a/roles/pgadmin4/defaults/main.yml
+++ b/roles/pgadmin4/defaults/main.yml
@@ -4,6 +4,6 @@ pga_id: 1
 pga_port: 5050
 pga_src_ip: []
 pga_root_dir: /opt/pgadmin4_{{ pga_id }}
-pga_version: '5.7'
+pga_version: '6.0'
 pga_pip_url: https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v{{ pga_version }}/pip/pgadmin4-{{ pga_version }}-py3-none-any.whl
 pga_master_pass: False