diff --git a/roles/cardano_node/defaults/main.yml b/roles/cardano_node/defaults/main.yml
index d8b6393..9d727b3 100644
--- a/roles/cardano_node/defaults/main.yml
+++ b/roles/cardano_node/defaults/main.yml
@@ -3,7 +3,7 @@
 cardano_node_install_method: 'docker'
 
 # Cardano node version
-cardano_node_version: '1.35.7'
+cardano_node_version: '8.9.1'
 
 # Cardano network
 cardano_node_network: mainnet
@@ -56,13 +56,13 @@ cardano_node_rts_flags: '-N2 -A64m -I0 -qg -qb --disable-delayed-os-memory-retur
 
 # Config
 cardano_node_manage_config: false # this currently controls mounting only
-cardano_node_config_file: '{{ cardano_node_config_container_dir }}/{{ cardano_node_network }}-config.json'
+cardano_node_config_file: '{{ cardano_node_config_container_dir }}/{{ cardano_node_network }}/config.json'
 
 # Topology
 cardano_node_manage_topology: false
 cardano_node_p2p_enabled: '{{ false if cardano_node_network == "mainnet" else true }}'
-cardano_node_p2p_use_ledger_after: 84916732
-cardano_node_topology_file: '{{ cardano_node_topology_container_dir }}/{{ cardano_node_network }}-topology.json'
+cardano_node_p2p_use_ledger_after: 116812831
+cardano_node_topology_file: '{{ cardano_node_topology_container_dir }}/{{ cardano_node_network }}/topology.json'
 cardano_node_topology_localroots: []
 cardano_node_topology_publicroots:
   - address: 'relays-new.cardano-{{ cardano_node_network }}.iohk.io'
diff --git a/roles/kupo/defaults/main.yml b/roles/kupo/defaults/main.yml
index 77a3033..9151fce 100644
--- a/roles/kupo/defaults/main.yml
+++ b/roles/kupo/defaults/main.yml
@@ -3,7 +3,7 @@
 kupo_install_method: 'docker'
 
 # Kupo version
-kupo_version: '2.5.1'
+kupo_version: '2.8.0'
 
 # Base host directory for node data
 cardano_node_dir: /opt/cardano
@@ -37,8 +37,8 @@ kupo_port: '{{ kupo_container_port }}'
 # Cardano network
 kupo_network: mainnet
 
-cardano_node_config_file: '{{ cardano_node_config_dir }}/{{ kupo_network }}-config.json'
-kupo_config_file: '{{ kupo_config_container_dir }}/{{ kupo_network }}-config.json'
+cardano_node_config_file: '{{ cardano_node_config_dir }}/{{ kupo_network }}/config.json'
+kupo_config_file: '{{ kupo_config_container_dir }}/{{ kupo_network }}/config.json'
 cardano_node_socket_name: node.socket
 
 # Kupo arguments (defaults to everything)
diff --git a/roles/ogmios/defaults/main.yml b/roles/ogmios/defaults/main.yml
index 1e1a957..a349ec1 100644
--- a/roles/ogmios/defaults/main.yml
+++ b/roles/ogmios/defaults/main.yml
@@ -3,7 +3,7 @@
 ogmios_install_method: 'docker'
 
 # Ogmios version
-ogmios_version: '5.6.0'
+ogmios_version: '6.2.0'
 
 # Base host directory for node data
 cardano_node_dir: /opt/cardano
@@ -21,7 +21,7 @@ cardano_node_user: root
 cardano_node_group: root
 
 # Docker image
-ogmios_docker_image: 'cardanosolutions/ogmios:v{{ ogmios_version }}-{{ ogmios_network }}'
+ogmios_docker_image: 'cardanosolutions/ogmios:v{{ ogmios_version }}'
 
 # Docker container name
 ogmios_docker_container_name: ogmios
@@ -30,8 +30,8 @@ ogmios_docker_container_name: ogmios
 ogmios_container_port: 1337
 ogmios_port: '{{ ogmios_container_port }}'
 
-cardano_node_config_file: '{{ cardano_node_config_dir }}/{{ ogmios_network }}-config.json'
-ogmios_config_file: '{{ ogmios_config_container_dir }}/{{ ogmios_network }}-config.json'
+cardano_node_config_file: '{{ cardano_node_config_dir }}/{{ ogmios_network }}/config.json'
+ogmios_config_file: '{{ ogmios_config_container_dir }}/{{ ogmios_network }}/config.json'
 cardano_node_socket_name: node.socket
 
 # Cardano network