diff --git a/packages/cardano-node/cardano-node-8.9.2.yaml b/packages/cardano-node/cardano-node-8.9.2.yaml
deleted file mode 100644
index 4eaaa4f..0000000
--- a/packages/cardano-node/cardano-node-8.9.2.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: cardano-node
-version: 8.9.2
-description: Cardano node software by Input Output Global
-dependencies:
-  - cardano-config >= 20240515
-  - cardano-cli >= 8.20
-  - mithril-client >= 0.7
-installSteps:
-  - docker:
-      containerName: cardano-node
-      image: ghcr.io/blinklabs-io/cardano-node:8.9.2
-      env:
-        CARDANO_NODE_SOCKET_PATH: /ipc/node.socket
-        NETWORK: '{{ .Context.Network }}'
-        RESTORE_NETWORK: 'false'
-      binds:
-        - '{{ .Paths.ContextDir }}/config:/opt/cardano/config'
-        - '{{ .Paths.ContextDir }}/node-ipc:/ipc'
-        - '{{ .Paths.DataDir }}/data:/data'
-      ports:
-        - "3001"
-        - "12788"
-        - "12798"
-      pullOnly: false
-  - file:
-      binary: true
-      filename: nview
-      source: files/nview.sh.gotmpl
-  - file:
-      binary: true
-      filename: txtop
-      source: files/txtop.sh.gotmpl
-outputs:
-  - name: socket_path
-    description: Path to the Cardano Node UNIX socket
-    value: '{{ .Paths.ContextDir }}/node-ipc/node.socket'
-preInstallScript: |
-  set -e
-  test -e {{ .Paths.DataDir }}/data/db/protocolMagicId && exit 0
-  mithril-client cardano-db download --download-dir {{ .Paths.DataDir }}/data latest
-tags:
-  - docker
-  - linux
-  - darwin
-  - amd64
-  - arm64
diff --git a/packages/dolos/dolos-0.7.0.yaml b/packages/dolos/dolos-0.7.0.yaml
deleted file mode 100644
index f465a38..0000000
--- a/packages/dolos/dolos-0.7.0.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: dolos
-version: 0.7.0
-description: Dolos is a Cardano data node
-dependencies:
-  - cardano-config >= 20240515
-installSteps:
-  - file:
-      filename: daemon.toml
-      source: files/daemon.toml.gotmpl
-  - docker:
-      containerName: dolos
-      image: ghcr.io/txpipe/dolos:v0.7.0
-      command: 
-        - dolos
-        - daemon
-      binds:
-        - '{{ .Paths.DataDir }}:/etc/dolos'
-        - '{{ .Paths.DataDir }}/data:/data'
-        - '{{ .Paths.ContextDir }}/config/{{ .Context.Network }}:/config'
-      ports:
-        - "30013"
-        - "50051"
-      pullOnly: false
-outputs:
-  - name: grpc
-    description: Dolos gRPC service
-    value: 'http://localhost:{{ index (index .Ports "dolos") "50051" }}'
-  - name: ouroboros-ntn
-    description: Dolos Ouroboros Node-to-Node service
-    value: 'localhost:{{ index (index .Ports "dolos") "30013" }}'
-tags:
-  - docker
-  - linux
-  - darwin
-  - amd64
-  - arm64
diff --git a/packages/dolos/dolos-0.9.0.yaml b/packages/dolos/dolos-0.9.0.yaml
index 8c19ca0..b6f5d7e 100644
--- a/packages/dolos/dolos-0.9.0.yaml
+++ b/packages/dolos/dolos-0.9.0.yaml
@@ -6,7 +6,7 @@ dependencies:
 installSteps:
   - file:
       filename: daemon.toml
-      source: files/daemon-0.9.0.toml.gotmpl
+      source: files/daemon.toml.gotmpl
   - docker:
       containerName: dolos
       image: ghcr.io/txpipe/dolos:v0.9.0
diff --git a/packages/dolos/files/daemon-0.9.0.toml.gotmpl b/packages/dolos/files/daemon-0.9.0.toml.gotmpl
deleted file mode 100644
index 3fb1464..0000000
--- a/packages/dolos/files/daemon-0.9.0.toml.gotmpl
+++ /dev/null
@@ -1,56 +0,0 @@
-# https://dolos.txpipe.io/configuration
-[upstream]
-peer_address = "{{ .Context.Network }}-node.world.dev.cardano.org:30000"
-network_magic = {{ .Context.NetworkMagic }}
-{{- if eq .Context.Network "mainnet" }}
-is_testnet = false
-{{ else }}
-is_testnet = true
-{{- end }}
- 
-[storage]
-path = "/data/db"
-wal_size = 1000
- 
-[relay]
-listen_address = "[::]:30013"
-magic = {{ .Context.NetworkMagic }}
-
-[sync]
-pull_batch_size = 200
- 
-[submit]
-prune_height = 10000
-# validate_phase_1 = false
-# validate_phase_2 = false
- 
-[genesis]
-byron_path = "/config/byron-genesis.json"
-shelley_path = "/config/shelley-genesis.json"
-alonzo_path = "/config/alonzo-genesis.json"
-
-[mithril]
-{{- if eq .Context.Network "mainnet" }}
-aggregator = "https://aggregator.release-mainnet.api.mithril.network/aggregator"
-{{- else if eq .Context.Network "preprod" }}
-aggregator = "https://aggregator.release-preprod.api.mithril.network/aggregator"
-{{- else if eq .Context.Network "preview" }}
-aggregator = "https://aggregator.prerelease-preview.api.mithril.network/aggregator"
-{{ else }}
-aggregator = "https://aggregator.prerelease-sanchonet.api.mithril.network/aggregator"
-{{- end }}
-{{- if eq .Context.Network "mainnet" }}
-genesis_key = "5b3139312c36362c3134302c3138352c3133382c31312c3233372c3230372c3235302c3134342c32372c322c3138382c33302c31322c38312c3135352c3230342c31302c3137392c37352c32332c3133382c3139362c3231372c352c31342c32302c35372c37392c33392c3137365d"
-{{ else }}
-genesis_key = "5b3132372c37332c3132342c3136312c362c3133372c3133312c3231332c3230372c3131372c3139382c38352c3137362c3139392c3136322c3234312c36382c3132332c3131392c3134352c31332c3233322c3234332c34392c3232392c322c3234392c3230352c3230352c33392c3233352c34345d"
-{{- end }}
- 
-[serve.grpc]
-listen_address = "[::]:50051"
- 
-[serve.ouroboros]
-listen_path = "/ipc/dolos.socket"
-magic = {{ .Context.NetworkMagic }}
- 
-[logging]
-max_level = "debug"
diff --git a/packages/dolos/files/daemon.toml.gotmpl b/packages/dolos/files/daemon.toml.gotmpl
index 0b57019..3fb1464 100644
--- a/packages/dolos/files/daemon.toml.gotmpl
+++ b/packages/dolos/files/daemon.toml.gotmpl
@@ -9,14 +9,13 @@ is_testnet = true
 {{- end }}
  
 [storage]
-path = "/data"
+path = "/data/db"
 wal_size = 1000
  
-[genesis]
-byron_path = "/config/byron-genesis.json"
-shelley_path = "/config/shelley-genesis.json"
-alonzo_path = "/config/alonzo-genesis.json"
- 
+[relay]
+listen_address = "[::]:30013"
+magic = {{ .Context.NetworkMagic }}
+
 [sync]
 pull_batch_size = 200
  
@@ -25,12 +24,32 @@ prune_height = 10000
 # validate_phase_1 = false
 # validate_phase_2 = false
  
+[genesis]
+byron_path = "/config/byron-genesis.json"
+shelley_path = "/config/shelley-genesis.json"
+alonzo_path = "/config/alonzo-genesis.json"
+
+[mithril]
+{{- if eq .Context.Network "mainnet" }}
+aggregator = "https://aggregator.release-mainnet.api.mithril.network/aggregator"
+{{- else if eq .Context.Network "preprod" }}
+aggregator = "https://aggregator.release-preprod.api.mithril.network/aggregator"
+{{- else if eq .Context.Network "preview" }}
+aggregator = "https://aggregator.prerelease-preview.api.mithril.network/aggregator"
+{{ else }}
+aggregator = "https://aggregator.prerelease-sanchonet.api.mithril.network/aggregator"
+{{- end }}
+{{- if eq .Context.Network "mainnet" }}
+genesis_key = "5b3139312c36362c3134302c3138352c3133382c31312c3233372c3230372c3235302c3134342c32372c322c3138382c33302c31322c38312c3135352c3230342c31302c3137392c37352c32332c3133382c3139362c3231372c352c31342c32302c35372c37392c33392c3137365d"
+{{ else }}
+genesis_key = "5b3132372c37332c3132342c3136312c362c3133372c3133312c3231332c3230372c3131372c3139382c38352c3137362c3139392c3136322c3234312c36382c3132332c3131392c3134352c31332c3233322c3234332c34392c3232392c322c3234392c3230352c3230352c33392c3233352c34345d"
+{{- end }}
+ 
 [serve.grpc]
 listen_address = "[::]:50051"
  
 [serve.ouroboros]
-listen_address = "[::]:30013"
-# https://github.com/txpipe/dolos/blob/main/examples/sync-mainnet/dolos.toml#L26
+listen_path = "/ipc/dolos.socket"
 magic = {{ .Context.NetworkMagic }}
  
 [logging]