diff --git a/.github/workflows/cl-besu.yml b/.github/workflows/cl-besu.yml
index 8341264..d61ad53 100644
--- a/.github/workflows/cl-besu.yml
+++ b/.github/workflows/cl-besu.yml
@@ -46,10 +46,10 @@ jobs:
       - name: Render Deployment YAML
         uses: cuchi/jinja2-action@v1.2.0
         with:
-          template: ./cl-besu.json.j2
-          output_file: ./majority-besu.json
+          template: ./cl-besu.yaml.j2
+          output_file: ./majority-besu.yaml
           strict: true
-          data_format: json
+          data_format: yaml
         env:
           TEKU_IMAGE: ${{ steps.fetch_image_name.outputs.teku_image }}
           NIMBUS_IMAGE: ${{ steps.fetch_image_name.outputs.nimbus_image }}
@@ -59,7 +59,7 @@ jobs:
           GETH_IMAGE: ${{ steps.fetch_image_name.outputs.geth_image }}
           BESU_IMAGE: ${{ steps.fetch_image_name.outputs.besu_image }}
       - name: Run kurtosis with the config
-        run: kurtosis module exec --enclave-id ${{ steps.fetch_image_name.outputs.enclave_name }} ${{ steps.fetch_image_name.outputs.kurtosis_image_name }} --execute-params "$(cat ./majority-besu.json)"
+        run: kurtosis module exec --enclave-id ${{ steps.fetch_image_name.outputs.enclave_name }} ${{ steps.fetch_image_name.outputs.kurtosis_image_name }} --execute-params "$(cat ./majority-besu.yaml)"
       - name: Run kurtosis with the config
         if: always()
         run: kurtosis enclave dump ${{ steps.fetch_image_name.outputs.enclave_name }} ${{ steps.fetch_image_name.outputs.enclave_name }}
diff --git a/.github/workflows/cl-erigon.yml b/.github/workflows/cl-erigon.yml
index b27c9cb..abfad72 100644
--- a/.github/workflows/cl-erigon.yml
+++ b/.github/workflows/cl-erigon.yml
@@ -40,10 +40,10 @@ jobs:
       - name: Render Deployment YAML
         uses: cuchi/jinja2-action@v1.2.0
         with:
-          template: ./cl-erigon.json.j2
-          output_file: ./majority-erigon.json
+          template: ./cl-erigon.yaml.j2
+          output_file: ./majority-erigon.yaml
           strict: true
-          data_format: json
+          data_format: yaml
         env:
           ERIGON_IMAGE: ${{ steps.fetch_image_name.outputs.erigon_image }}
           TEKU_IMAGE: ${{ steps.fetch_image_name.outputs.teku_image }}
@@ -53,7 +53,7 @@ jobs:
           LODESTAR_IMAGE: ${{ steps.fetch_image_name.outputs.lodestar_image }}
           GETH_IMAGE: ${{ steps.fetch_image_name.outputs.geth_image }}
       - name: Run kurtosis with the config
-        run: kurtosis module exec --enclave-id ${{ steps.fetch_image_name.outputs.enclave_name }} ${{ steps.fetch_image_name.outputs.kurtosis_image_name }} --execute-params "$(cat ./majority-erigon.json)"
+        run: kurtosis module exec --enclave-id ${{ steps.fetch_image_name.outputs.enclave_name }} ${{ steps.fetch_image_name.outputs.kurtosis_image_name }} --execute-params "$(cat ./majority-erigon.yaml)"
       - name: Run kurtosis with the config
         if: always()
         run: kurtosis enclave dump ${{ steps.fetch_image_name.outputs.enclave_name }} ${{ steps.fetch_image_name.outputs.enclave_name }}
diff --git a/.github/workflows/cl-geth.yml b/.github/workflows/cl-geth.yml
index d31f0cf..9c6472c 100644
--- a/.github/workflows/cl-geth.yml
+++ b/.github/workflows/cl-geth.yml
@@ -45,10 +45,10 @@ jobs:
       - name: Render Deployment YAML
         uses: cuchi/jinja2-action@v1.2.0
         with:
-          template: ./cl-geth.json.j2
-          output_file: ./majority-geth.json
+          template: ./cl-geth.yaml.j2
+          output_file: ./majority-geth.yaml
           strict: true
-          data_format: json
+          data_format: yaml
         env:
           TEKU_IMAGE: ${{ steps.fetch_image_name.outputs.teku_image }}
           NIMBUS_IMAGE: ${{ steps.fetch_image_name.outputs.nimbus_image }}
@@ -58,7 +58,7 @@ jobs:
           GETH_IMAGE: ${{ steps.fetch_image_name.outputs.geth_image }}
           NETHERMIND_IMAGE: ${{ steps.fetch_image_name.outputs.nethermind_image }}
       - name: Run kurtosis with the config
-        run: kurtosis module exec --enclave-id ${{ steps.fetch_image_name.outputs.enclave_name }} ${{ steps.fetch_image_name.outputs.kurtosis_image_name }} --execute-params "$(cat ./majority-geth.json)"
+        run: kurtosis module exec --enclave-id ${{ steps.fetch_image_name.outputs.enclave_name }} ${{ steps.fetch_image_name.outputs.kurtosis_image_name }} --execute-params "$(cat ./majority-geth.yaml)"
       - name: Run kurtosis with the config
         if: always()
         run: kurtosis enclave dump ${{ steps.fetch_image_name.outputs.enclave_name }} ${{ steps.fetch_image_name.outputs.enclave_name }}
diff --git a/.github/workflows/cl-nethermind.yml b/.github/workflows/cl-nethermind.yml
index fe667cc..ca699e6 100644
--- a/.github/workflows/cl-nethermind.yml
+++ b/.github/workflows/cl-nethermind.yml
@@ -46,10 +46,10 @@ jobs:
       - name: Render Deployment YAML
         uses: cuchi/jinja2-action@v1.2.0
         with:
-          template: ./cl-nethermind.json.j2
-          output_file: ./majority-nethermind.json
+          template: ./cl-nethermind.yaml.j2
+          output_file: ./majority-nethermind.yaml
           strict: true
-          data_format: json
+          data_format: yaml
         env:
           TEKU_IMAGE: ${{ steps.fetch_image_name.outputs.teku_image }}
           NIMBUS_IMAGE: ${{ steps.fetch_image_name.outputs.nimbus_image }}
@@ -59,7 +59,7 @@ jobs:
           GETH_IMAGE: ${{ steps.fetch_image_name.outputs.geth_image }}
           NETHERMIND_IMAGE: ${{ steps.fetch_image_name.outputs.nethermind_image }}
       - name: Run kurtosis with the config
-        run: kurtosis module exec --enclave-id ${{ steps.fetch_image_name.outputs.enclave_name }} ${{ steps.fetch_image_name.outputs.kurtosis_image_name }} --execute-params "$(cat ./majority-nethermind.json)"
+        run: kurtosis module exec --enclave-id ${{ steps.fetch_image_name.outputs.enclave_name }} ${{ steps.fetch_image_name.outputs.kurtosis_image_name }} --execute-params "$(cat ./majority-nethermind.yaml)"
       - name: Run kurtosis with the config
         if: always()
         run: kurtosis enclave dump ${{ steps.fetch_image_name.outputs.enclave_name }} ${{ steps.fetch_image_name.outputs.enclave_name }}
diff --git a/.github/workflows/multiclient.yml b/.github/workflows/multiclient.yml
index ffb269f..08782c2 100644
--- a/.github/workflows/multiclient.yml
+++ b/.github/workflows/multiclient.yml
@@ -44,10 +44,10 @@ jobs:
       - name: Render Deployment YAML
         uses: cuchi/jinja2-action@v1.2.0
         with:
-          template: ./config.json.j2
-          output_file: ./config.json
+          template: ./config.yaml.j2
+          output_file: ./config.yaml
           strict: true
-          data_format: json
+          data_format: yaml
         env:
           TEKU_IMAGE: ${{ steps.fetch_image_name.outputs.teku_image }}
           NIMBUS_IMAGE: ${{ steps.fetch_image_name.outputs.nimbus_image }}
@@ -57,7 +57,7 @@ jobs:
           GETH_IMAGE: ${{ steps.fetch_image_name.outputs.geth_image }}
           NETHERMIND_IMAGE: ${{ steps.fetch_image_name.outputs.nethermind_image }}
       - name: Run kurtosis with the config
-        run: kurtosis module exec --enclave-id newname ${{ steps.fetch_image_name.outputs.kurtosis_image_name }} --execute-params "$(cat ./config.json)"
+        run: kurtosis module exec --enclave-id newname ${{ steps.fetch_image_name.outputs.kurtosis_image_name }} --execute-params "$(cat ./config.yaml)"
       - name: Run kurtosis with the config
         if: always()
         run: kurtosis enclave dump newname dumped_logs
diff --git a/cl-besu.json.j2 b/cl-besu.json.j2
deleted file mode 100644
index 1f8d7c0..0000000
--- a/cl-besu.json.j2
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "participants": [
-    {
-      "elType": "geth",
-      "elImage": "{{ env['GETH_IMAGE'] }}",
-      "clType": "lighthouse",
-      "clImage": "{{ env['LIGHTHOUSE_IMAGE'] }}"
-    },
-    {
-      "elType": "geth",
-      "elImage": "{{ env['GETH_IMAGE'] }}",
-      "clType": "lighthouse",
-      "clImage": "{{ env['LIGHTHOUSE_IMAGE'] }}"
-    },
-    {
-      "elType": "besu",
-      "elImage": "{{ env['BESU_IMAGE'] }}",
-      "clType": "teku",
-      "clImage": "{{ env['TEKU_IMAGE'] }}"
-    },
-    {
-      "elType": "besu",
-      "elImage": "{{ env['BESU_IMAGE'] }}",
-      "clType": "teku",
-      "clImage": "{{ env['TEKU_IMAGE'] }}"
-    },
-     {
-       "elType": "besu",
-       "elImage": "{{ env['BESU_IMAGE'] }}",
-       "clType": "nimbus",
-       "clImage": "{{ env['NIMBUS_IMAGE'] }}",
-       "beaconExtraParams": ["--num-threads=4"]
-     },
-    {
-      "elType": "besu",
-      "elImage": "{{ env['BESU_IMAGE'] }}",
-      "clType": "nimbus",
-      "clImage": "{{ env['NIMBUS_IMAGE'] }}",
-      "beaconExtraParams": ["--num-threads=4"]
-    },
-    {
-      "elType": "besu",
-      "elImage": "{{ env['BESU_IMAGE'] }}",
-      "clType": "prysm",
-      "clImage": "{{ env['PRYSM_IMAGE'] }}"
-    },
-    {
-      "elType": "besu",
-      "elImage": "{{ env['BESU_IMAGE'] }}",
-      "clType": "prysm",
-      "clImage": "{{ env['PRYSM_IMAGE'] }}"
-    }
-  ],
-  "network": {
-    "networkId": "3151908",
-    "depositContractAddress": "0x4242424242424242424242424242424242424242",
-    "secondsPerSlot": 12,
-    "slotsPerEpoch": 32,
-    "altairForkEpoch": 1,
-    "mergeForkEpoch": 3,
-    "totalTerminalDifficulty": 300000000,
-    "numValidatorKeysPerNode": 64,
-    "preregisteredValidatorKeysMnemonic": "giant issue aisle success illegal bike spike question tent bar rely arctic volcano long crawl hungry vocal artwork sniff fantasy very lucky have athlete"
-  },
-  "waitForMining": true,
-  "waitForFinalization": true,
-  "waitForVerifications": true,
-  "verificationsTTDEpochLimit": 30,
-  "verificationsEpochLimit": 5,
-  "logLevel": "info"
-}
\ No newline at end of file
diff --git a/cl-besu.yaml.j2 b/cl-besu.yaml.j2
new file mode 100644
index 0000000..463d77b
--- /dev/null
+++ b/cl-besu.yaml.j2
@@ -0,0 +1,35 @@
+participants:
+- elType: besu
+  elImage: "{{ env['BESU_IMAGE'] }}"
+  clType: lighthouse
+  clImage: "{{ env['LIGHTHOUSE_IMAGE'] }}"
+- elType: besu
+  elImage: "{{ env['BESU_IMAGE'] }}"
+  clType: lighthouse
+  clImage: "{{ env['LIGHTHOUSE_IMAGE'] }}"
+- elType: besu
+  elImage: "{{ env['BESU_IMAGE'] }}"
+  clType: teku
+  clImage: "{{ env['TEKU_IMAGE'] }}"
+- elType: besu
+  elImage: "{{ env['BESU_IMAGE'] }}"
+  clType: teku
+  clImage: "{{ env['TEKU_IMAGE'] }}"
+network:
+  networkId: '3151908'
+  depositContractAddress: '0x4242424242424242424242424242424242424242'
+  secondsPerSlot: 12
+  slotsPerEpoch: 32
+  altairForkEpoch: 0
+  mergeForkEpoch: 0
+  totalTerminalDifficulty: 0
+  numValidatorKeysPerNode: 64
+  preregisteredValidatorKeysMnemonic: giant issue aisle success illegal bike spike
+    question tent bar rely arctic volcano long crawl hungry vocal artwork sniff fantasy
+    very lucky have athlete
+waitForMining: false
+waitForFinalization: true
+waitForVerifications: true
+verificationsEpochLimit: 5
+logLevel: info
+
diff --git a/cl-erigon.json.j2 b/cl-erigon.json.j2
deleted file mode 100644
index b1d16ad..0000000
--- a/cl-erigon.json.j2
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "participants": [
-    {
-      "elType": "geth",
-      "elImage": "{{ env['GETH_IMAGE'] }}",
-      "clType": "lighthouse",
-      "clImage": "{{ env['LIGHTHOUSE_IMAGE'] }}"
-    },
-    {
-      "elType": "erigon",
-      "elImage": "{{ env['ERIGON_IMAGE'] }}",
-      "clType": "lighthouse",
-      "clImage": "{{ env['LIGHTHOUSE_IMAGE'] }}"
-    },
-    {
-      "elType": "erigon",
-      "elImage": "{{ env['ERIGON_IMAGE'] }}",
-      "clType": "teku",
-      "clImage": "{{ env['TEKU_IMAGE'] }}"
-    },
-    {
-      "elType": "erigon",
-      "elImage": "{{ env['ERIGON_IMAGE'] }}",
-      "clType": "teku",
-      "clImage": "{{ env['TEKU_IMAGE'] }}"
-    },
-     {
-       "elType": "erigon",
-       "elImage": "{{ env['ERIGON_IMAGE'] }}",
-       "clType": "nimbus",
-       "clImage": "{{ env['NIMBUS_IMAGE'] }}",
-       "beaconExtraParams": ["--num-threads=4"]
-     },
-    {
-      "elType": "erigon",
-      "elImage": "{{ env['ERIGON_IMAGE'] }}",
-      "clType": "nimbus",
-      "clImage": "{{ env['NIMBUS_IMAGE'] }}",
-      "beaconExtraParams": ["--num-threads=4"]
-    },
-    {
-      "elType": "erigon",
-      "elImage": "{{ env['ERIGON_IMAGE'] }}",
-      "clType": "prysm",
-      "clImage": "{{ env['PRYSM_IMAGE'] }}"
-    },
-    {
-      "elType": "erigon",
-      "elImage": "{{ env['ERIGON_IMAGE'] }}",
-      "clType": "prysm",
-      "clImage": "{{ env['PRYSM_IMAGE'] }}"
-    }
-  ],
-  "network": {
-    "networkId": "3151908",
-    "depositContractAddress": "0x4242424242424242424242424242424242424242",
-    "secondsPerSlot": 12,
-    "slotsPerEpoch": 32,
-    "altairForkEpoch": 1,
-    "mergeForkEpoch": 3,
-    "totalTerminalDifficulty": 300000000,
-    "numValidatorKeysPerNode": 64,
-    "preregisteredValidatorKeysMnemonic": "giant issue aisle success illegal bike spike question tent bar rely arctic volcano long crawl hungry vocal artwork sniff fantasy very lucky have athlete"
-  },
-  "waitForMining": true,
-  "waitForFinalization": true,
-  "waitForVerifications": true,
-  "verificationsTTDEpochLimit": 30,
-  "verificationsEpochLimit": 5,
-  "logLevel": "info"
-}
\ No newline at end of file
diff --git a/cl-erigon.yaml.j2 b/cl-erigon.yaml.j2
new file mode 100644
index 0000000..41fe53c
--- /dev/null
+++ b/cl-erigon.yaml.j2
@@ -0,0 +1,34 @@
+participants:
+- elType: erigon
+  elImage: "{{ env['ERIGON_IMAGE'] }}"
+  clType: lighthouse
+  clImage: "{{ env['LIGHTHOUSE_IMAGE'] }}"
+- elType: erigon
+  elImage: "{{ env['ERIGON_IMAGE'] }}"
+  clType: lighthouse
+  clImage: "{{ env['LIGHTHOUSE_IMAGE'] }}"
+- elType: erigon
+  elImage: "{{ env['ERIGON_IMAGE'] }}"
+  clType: teku
+  clImage: "{{ env['TEKU_IMAGE'] }}"
+- elType: erigon
+  elImage: "{{ env['ERIGON_IMAGE'] }}"
+  clType: teku
+  clImage: "{{ env['TEKU_IMAGE'] }}"
+network:
+  networkId: '3151908'
+  depositContractAddress: '0x4242424242424242424242424242424242424242'
+  secondsPerSlot: 12
+  slotsPerEpoch: 32
+  altairForkEpoch: 0
+  mergeForkEpoch: 0
+  totalTerminalDifficulty: 0
+  numValidatorKeysPerNode: 64
+  preregisteredValidatorKeysMnemonic: giant issue aisle success illegal bike spike
+    question tent bar rely arctic volcano long crawl hungry vocal artwork sniff fantasy
+    very lucky have athlete
+waitForMining: false
+waitForFinalization: true
+waitForVerifications: true
+verificationsEpochLimit: 5
+logLevel: info
diff --git a/cl-geth.json.j2 b/cl-geth.json.j2
deleted file mode 100644
index 649496c..0000000
--- a/cl-geth.json.j2
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "participants": [
-    {
-      "elType": "geth",
-      "elImage": "{{ env['GETH_IMAGE'] }}",
-      "clType": "lighthouse",
-      "clImage": "{{ env['LIGHTHOUSE_IMAGE'] }}"
-    },
-    {
-      "elType": "geth",
-      "elImage": "{{ env['GETH_IMAGE'] }}",
-      "clType": "lighthouse",
-      "clImage": "{{ env['LIGHTHOUSE_IMAGE'] }}"
-    },
-    {
-      "elType": "geth",
-      "elImage": "{{ env['GETH_IMAGE'] }}",
-      "clType": "teku",
-      "clImage": "{{ env['TEKU_IMAGE'] }}"
-    },
-    {
-      "elType": "geth",
-      "elImage": "{{ env['GETH_IMAGE'] }}",
-      "clType": "teku",
-      "clImage": "{{ env['TEKU_IMAGE'] }}"
-    },
-     {
-       "elType": "geth",
-       "elImage": "{{ env['GETH_IMAGE'] }}",
-       "clType": "nimbus",
-       "clImage": "{{ env['NIMBUS_IMAGE'] }}",
-       "beaconExtraParams": ["--num-threads=4"]
-     },
-    {
-      "elType": "geth",
-      "elImage": "{{ env['GETH_IMAGE'] }}",
-      "clType": "nimbus",
-      "clImage": "{{ env['NIMBUS_IMAGE'] }}",
-      "beaconExtraParams": ["--num-threads=4"]
-    },
-    {
-      "elType": "geth",
-      "elImage": "{{ env['GETH_IMAGE'] }}",
-      "clType": "prysm",
-      "clImage": "{{ env['PRYSM_IMAGE'] }}"
-    },
-    {
-      "elType": "geth",
-      "elImage": "{{ env['GETH_IMAGE'] }}",
-      "clType": "prysm",
-      "clImage": "{{ env['PRYSM_IMAGE'] }}"
-    }
-  ],
-  "network": {
-    "networkId": "3151908",
-    "depositContractAddress": "0x4242424242424242424242424242424242424242",
-    "secondsPerSlot": 12,
-    "slotsPerEpoch": 32,
-    "altairForkEpoch": 1,
-    "mergeForkEpoch": 3,
-    "totalTerminalDifficulty": 300000000,
-    "numValidatorKeysPerNode": 64,
-    "preregisteredValidatorKeysMnemonic": "giant issue aisle success illegal bike spike question tent bar rely arctic volcano long crawl hungry vocal artwork sniff fantasy very lucky have athlete"
-  },
-  "waitForMining": true,
-  "waitForFinalization": true,
-  "waitForVerifications": true,
-  "verificationsTTDEpochLimit": 30,
-  "verificationsEpochLimit": 5,
-  "logLevel": "info"
-}
\ No newline at end of file
diff --git a/cl-geth.yaml.j2 b/cl-geth.yaml.j2
new file mode 100644
index 0000000..431605d
--- /dev/null
+++ b/cl-geth.yaml.j2
@@ -0,0 +1,34 @@
+participants:
+- elType: geth
+  elImage: "{{ env['GETH_IMAGE'] }}"
+  clType: lighthouse
+  clImage: "{{ env['LIGHTHOUSE_IMAGE'] }}"
+- elType: geth
+  elImage: "{{ env['GETH_IMAGE'] }}"
+  clType: lighthouse
+  clImage: "{{ env['LIGHTHOUSE_IMAGE'] }}"
+- elType: geth
+  elImage: "{{ env['GETH_IMAGE'] }}"
+  clType: teku
+  clImage: "{{ env['TEKU_IMAGE'] }}"
+- elType: geth
+  elImage: "{{ env['GETH_IMAGE'] }}"
+  clType: teku
+  clImage: "{{ env['TEKU_IMAGE'] }}"
+network:
+  networkId: '3151908'
+  depositContractAddress: '0x4242424242424242424242424242424242424242'
+  secondsPerSlot: 12
+  slotsPerEpoch: 32
+  altairForkEpoch: 0
+  mergeForkEpoch: 0
+  totalTerminalDifficulty: 0
+  numValidatorKeysPerNode: 64
+  preregisteredValidatorKeysMnemonic: giant issue aisle success illegal bike spike
+    question tent bar rely arctic volcano long crawl hungry vocal artwork sniff fantasy
+    very lucky have athlete
+waitForMining: false
+waitForFinalization: true
+waitForVerifications: true
+verificationsEpochLimit: 5
+logLevel: info
diff --git a/cl-nethermind.json.j2 b/cl-nethermind.json.j2
deleted file mode 100644
index ffd662c..0000000
--- a/cl-nethermind.json.j2
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "participants": [
-    {
-      "elType": "geth",
-      "elImage": "{{ env['GETH_IMAGE'] }}",
-      "clType": "lighthouse",
-      "clImage": "{{ env['LIGHTHOUSE_IMAGE'] }}"
-    },
-    {
-      "elType": "geth",
-      "elImage": "{{ env['GETH_IMAGE'] }}",
-      "clType": "lighthouse",
-      "clImage": "{{ env['LIGHTHOUSE_IMAGE'] }}"
-    },
-    {
-      "elType": "nethermind",
-      "elImage": "{{ env['NETHERMIND_IMAGE'] }}",
-      "clType": "teku",
-      "clImage": "{{ env['TEKU_IMAGE'] }}"
-    },
-    {
-      "elType": "nethermind",
-      "elImage": "{{ env['NETHERMIND_IMAGE'] }}",
-      "clType": "teku",
-      "clImage": "{{ env['TEKU_IMAGE'] }}"
-    },
-     {
-      "elType": "nethermind",
-      "elImage": "{{ env['NETHERMIND_IMAGE'] }}",
-      "clType": "nimbus",
-      "clImage": "{{ env['NIMBUS_IMAGE'] }}",
-      "beaconExtraParams": ["--num-threads=4"]
-     },
-    {
-      "elType": "nethermind",
-      "elImage": "{{ env['NETHERMIND_IMAGE'] }}",
-      "clType": "nimbus",
-      "clImage": "{{ env['NIMBUS_IMAGE'] }}",
-      "beaconExtraParams": ["--num-threads=4"]
-    },
-    {
-      "elType": "nethermind",
-      "elImage": "{{ env['NETHERMIND_IMAGE'] }}",
-      "clType": "prysm",
-      "clImage": "{{ env['PRYSM_IMAGE'] }}"
-    },
-    {
-      "elType": "nethermind",
-      "elImage": "{{ env['NETHERMIND_IMAGE'] }}",
-      "clType": "prysm",
-      "clImage": "{{ env['PRYSM_IMAGE'] }}"
-    }
-  ],
-  "network": {
-    "networkId": "3151908",
-    "depositContractAddress": "0x4242424242424242424242424242424242424242",
-    "secondsPerSlot": 12,
-    "slotsPerEpoch": 32,
-    "altairForkEpoch": 1,
-    "mergeForkEpoch": 3,
-    "totalTerminalDifficulty": 300000000,
-    "numValidatorKeysPerNode": 64,
-    "preregisteredValidatorKeysMnemonic": "giant issue aisle success illegal bike spike question tent bar rely arctic volcano long crawl hungry vocal artwork sniff fantasy very lucky have athlete"
-  },
-  "waitForMining": true,
-  "waitForFinalization": true,
-   "waitForVerifications": true,
-   "verificationsTTDEpochLimit": 30,
-   "verificationsEpochLimit": 5,
-  "logLevel": "info"
-}
\ No newline at end of file
diff --git a/cl-nethermind.yaml.j2 b/cl-nethermind.yaml.j2
new file mode 100644
index 0000000..c7a12e4
--- /dev/null
+++ b/cl-nethermind.yaml.j2
@@ -0,0 +1,34 @@
+participants:
+- elType: nethermind
+  elImage: "{{ env['NETHERMIND_IMAGE'] }}"
+  clType: lighthouse
+  clImage: "{{ env['LIGHTHOUSE_IMAGE'] }}"
+- elType: nethermind
+  elImage: "{{ env['NETHERMIND_IMAGE'] }}"
+  clType: lighthouse
+  clImage: "{{ env['LIGHTHOUSE_IMAGE'] }}"
+- elType: nethermind
+  elImage: "{{ env['NETHERMIND_IMAGE'] }}"
+  clType: teku
+  clImage: "{{ env['TEKU_IMAGE'] }}"
+- elType: nethermind
+  elImage: "{{ env['NETHERMIND_IMAGE'] }}"
+  clType: teku
+  clImage: "{{ env['TEKU_IMAGE'] }}"
+network:
+  networkId: '3151908'
+  depositContractAddress: '0x4242424242424242424242424242424242424242'
+  secondsPerSlot: 12
+  slotsPerEpoch: 32
+  altairForkEpoch: 0
+  mergeForkEpoch: 0
+  totalTerminalDifficulty: 0
+  numValidatorKeysPerNode: 64
+  preregisteredValidatorKeysMnemonic: giant issue aisle success illegal bike spike
+    question tent bar rely arctic volcano long crawl hungry vocal artwork sniff fantasy
+    very lucky have athlete
+waitForMining: false
+waitForFinalization: true
+waitForVerifications: true
+verificationsEpochLimit: 5
+logLevel: info
diff --git a/config.json.j2 b/config.json.j2
deleted file mode 100644
index f48b8d9..0000000
--- a/config.json.j2
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "participants": [
-    {
-      "elType": "geth",
-      "elImage": "{{ env['GETH_IMAGE'] }}",
-      "clType": "teku",
-      "clImage": "{{ env['TEKU_IMAGE'] }}"
-    },
-    {
-      "elType": "geth",
-      "elImage": "{{ env['GETH_IMAGE'] }}",
-      "clType": "lighthouse",
-      "clImage": "{{ env['LIGHTHOUSE_IMAGE'] }}"
-    },
-    {
-      "elType": "geth",
-      "elImage": "{{ env['GETH_IMAGE'] }}",
-      "clType": "nimbus",
-      "clImage": "{{ env['NIMBUS_IMAGE'] }}",
-      "beaconExtraParams": ["--num-threads=4"]
-    },
-    {
-      "elType": "geth",
-      "elImage": "{{ env['GETH_IMAGE'] }}",
-      "clType": "prysm",
-      "clImage": "{{ env['PRYSM_IMAGE'] }}"
-    },
-    {
-      "elType": "nethermind",
-      "elImage": "{{ env['NETHERMIND_IMAGE'] }}",
-      "clType": "teku",
-      "clImage": "{{ env['TEKU_IMAGE'] }}"
-    },
-    {
-      "elType": "nethermind",
-      "elImage": "{{ env['NETHERMIND_IMAGE'] }}",
-      "clType": "lighthouse",
-      "clImage": "{{ env['LIGHTHOUSE_IMAGE'] }}"
-    },
-    {
-      "elType": "nethermind",
-      "elImage": "{{ env['NETHERMIND_IMAGE'] }}",
-      "clType": "nimbus",
-      "clImage": "{{ env['NIMBUS_IMAGE'] }}",
-      "beaconExtraParams": ["--num-threads=4"]
-    },
-    {
-      "elType": "nethermind",
-      "elImage": "{{ env['NETHERMIND_IMAGE'] }}",
-      "clType": "prysm",
-      "clImage": "{{ env['PRYSM_IMAGE'] }}"
-    }
-  ],
-  "network": {
-    "networkId": "3151908",
-    "depositContractAddress": "0x4242424242424242424242424242424242424242",
-    "secondsPerSlot": 12,
-    "slotsPerEpoch": 32,
-    "altairForkEpoch": 1,
-    "mergeForkEpoch": 3,
-    "totalTerminalDifficulty": 300000000,
-    "numValidatorKeysPerNode": 64,
-    "preregisteredValidatorKeysMnemonic": "giant issue aisle success illegal bike spike question tent bar rely arctic volcano long crawl hungry vocal artwork sniff fantasy very lucky have athlete"
-  },
-  "waitForMining": true,
-  "waitForFinalization": true,
-  "waitForVerifications": true,
-  "verificationsTTDEpochLimit": 30,
-  "verificationsEpochLimit": 5,
-  "logLevel": "info"
-}
\ No newline at end of file
diff --git a/config.yaml.j2 b/config.yaml.j2
new file mode 100644
index 0000000..7a93abd
--- /dev/null
+++ b/config.yaml.j2
@@ -0,0 +1,34 @@
+participants:
+- elType: geth
+  elImage: "{{ env['GETH_IMAGE'] }}"
+  clType: lighthouse
+  clImage: "{{ env['LIGHTHOUSE_IMAGE'] }}"
+- elType: nethermind
+  elImage: "{{ env['NETHERMIND_IMAGE'] }}"
+  clType: lighthouse
+  clImage: "{{ env['LIGHTHOUSE_IMAGE'] }}"
+- elType: nethermind
+  elImage: "{{ env['NETHERMIND_IMAGE'] }}"
+  clType: teku
+  clImage: "{{ env['TEKU_IMAGE'] }}"
+- elType: geth
+  elImage: "{{ env['GETH_IMAGE'] }}"
+  clType: teku
+  clImage: "{{ env['TEKU_IMAGE'] }}"
+network:
+  networkId: '3151908'
+  depositContractAddress: '0x4242424242424242424242424242424242424242'
+  secondsPerSlot: 12
+  slotsPerEpoch: 32
+  altairForkEpoch: 0
+  mergeForkEpoch: 0
+  totalTerminalDifficulty: 0
+  numValidatorKeysPerNode: 64
+  preregisteredValidatorKeysMnemonic: giant issue aisle success illegal bike spike
+    question tent bar rely arctic volcano long crawl hungry vocal artwork sniff fantasy
+    very lucky have athlete
+waitForMining: false
+waitForFinalization: true
+waitForVerifications: true
+verificationsEpochLimit: 5
+logLevel: info
diff --git a/return-cl-image-info.sh b/return-cl-image-info.sh
index e394a09..2e9d465 100755
--- a/return-cl-image-info.sh
+++ b/return-cl-image-info.sh
@@ -7,29 +7,29 @@ echo $1:$IMAGE_NAME
 
 if [[ $1 == "teku" ]]
 then
-    echo "consensys/teku:22.8.1"
+    echo "consensys/teku:22.10.1"
 elif [[ $1 == "lighthouse" ]]
 then
-    echo "sigp/lighthouse:v3.0.0"
+    echo "sigp/lighthouse:v3.1.2"
 elif [[ $1 == "nimbus" ]]
 then
-    echo "statusim/nimbus-eth2:amd64-v22.8.0"
+    echo "statusim/nimbus-eth2:amd64-v22.10.1"
 elif [[ $1 == "lodestar" ]]
 then
     echo "chainsafe/lodestar:v1.0.0"
 elif [[ $1 == "prysm" ]]
 then
-    echo "gcr.io/prysmaticlabs/prysm/beacon-chain:v3.0.0,gcr.io/prysmaticlabs/prysm/validator:v3.0.0"
+    echo "gcr.io/prysmaticlabs/prysm/beacon-chain:v3.1.1,gcr.io/prysmaticlabs/prysm/validator:v3.1.1"
 elif [[ $1 == "nethermind" ]]
 then
-    echo "nethermind/nethermind:1.14.0"
+    echo "nethermind/nethermind:1.14.3"
 elif [[ $1 == "besu" ]]
 then
-    echo "hyperledger/besu:22.7.1"
+    echo "hyperledger/besu:22.7.7"
 elif [[ $1 == "erigon" ]]
 then
     echo "parithoshj/erigon:devel"
 elif [[ $1 == "kurtosis" ]]
 then
-    echo "kurtosistech/eth2-merge-kurtosis-module:0.5.9"
+    echo "kurtosistech/eth2-merge-kurtosis-module:0.7.0"
 fi