diff --git a/.github/tests/peerdas-devnet-1.yaml b/.github/tests/peerdas-devnet-1.yaml
new file mode 100644
index 000000000..4e2fb424b
--- /dev/null
+++ b/.github/tests/peerdas-devnet-1.yaml
@@ -0,0 +1,10 @@
+participants:
+  - cl_type: prysm
+    cl_image: ethpandaops/prysm-beacon-chain:peerDAS
+  - cl_type: lighthouse
+    cl_image: ethpandaops/lighthouse:das
+  - cl_type: teku
+    cl_image: ethpandaops/teku:nashatyrev-das
+network_params:
+  network: peerdas-devnet-1
+snooper_enabled: true
diff --git a/.github/tests/peerdas-fork.yaml b/.github/tests/peerdas-fork.yaml
index 8c93940cf..88d19fe2a 100644
--- a/.github/tests/peerdas-fork.yaml
+++ b/.github/tests/peerdas-fork.yaml
@@ -1,28 +1,19 @@
 participants:
-  - el_type: geth
-    el_image: ethpandaops/geth:master
-    cl_type: prysm
+  - cl_type: prysm
     cl_image: ethpandaops/prysm-beacon-chain:peerDAS
-    cl_max_mem: 2048
-  - el_type: geth
-    el_image: ethpandaops/geth:master
-    cl_type: lighthouse
+    cl_extra_params: [
+        --subscribe-all-subnets,
+    ]
+  - cl_type: lighthouse
     cl_extra_params: [
         --subscribe-all-data-column-subnets,
     ]
     cl_image: ethpandaops/lighthouse:das
-  - el_type: geth
-    cl_type: lighthouse
-    cl_image: ethpandaops/lighthouse:das
-  - el_type: geth
-    el_image: ethpandaops/geth:master
-    cl_type: teku
-    cl_image: ethpandaops/teku:das
-  - el_type: geth
-    el_image: ethpandaops/geth:master
-    cl_type: nimbus
-    cl_image: ethpandaops/nimbus-eth2:wip-peerdas
-    validator_count: 1
+  - cl_type: teku
+    cl_image: ethpandaops/teku:nashatyrev-das
+    cl_extra_params: [
+        --p2p-subscribe-all-custody-subnets-enabled,
+    ]
 network_params:
   eip7594_fork_epoch: 0
   eip7594_fork_version: "0x50000038"