--- a/.docker/forkless-config/zombienet-forkless-nodata.toml
+++ b/.docker/forkless-config/zombienet-forkless-nodata.toml
@@ -18,12 +18,6 @@
 
 [[parachains]]
 id = 1000
-chain_spec_modifier_commands = [[
-  "chainql",
-  "--tla-code=rawSpec=import '{{'raw'|chainSpec}}'",
-  "--tla-str=forkFrom={{ REPLICA_FROM }}",
-  "fork.jsonnet",
-]]
 
   [[parachains.collators]]
   name = "alice"
--- a/launch-zombienet.toml
+++ b/launch-zombienet.toml
@@ -1,10 +1,10 @@
-# To launch this zombienet out-of-the-box, you can use `yarn frankenstein` in the `tests` folder.
+# To launch this zombienet out-of-the-box, run `yarn frankenstein` in the `tests` folder.
 
 [settings]
 provider = "native"
 
 [relaychain]
-# RELAY_DIR is an environment variable. You should likely specify it as ../polkadot/
+# RELAY_DIR is an environment variable. If you're launching ZN from the repository's root, you should likely specify it as ../polkadot/
 default_command = "{{RELAY_DIR}}target/release/polkadot"
 default_args = [ "-lparachain::candidate_validation=debug", "-lxcm=trace", ]
 chain = "rococo-local"
@@ -24,7 +24,7 @@
 
   [[parachains.collators]]
   name = "alice"
-  # PARA_DIR is an environment variable. You should likely specify it as ./
+  # PARA_DIR is an environment variable. If you're launching ZN from the repository's root, you should likely specify it as ./
   command = "{{PARA_DIR}}target/release/unique-collator"
   ws_port = 9944
   rpc_port = 9933
@@ -33,7 +33,7 @@
 
   [[parachains.collators]]
   name = "bob"
-  # PARA_DIR is an environment variable. You should likely specify it as ./
+  # PARA_DIR is an environment variable. If you're launching ZN from the repository's root, you should likely specify it as ./
   command = "{{PARA_DIR}}target/release/unique-collator"
   ws_port = 9945
   rpc_port = 9934
--- a/tests/src/util/frankenstein.ts
+++ b/tests/src/util/frankenstein.ts
@@ -96,7 +96,7 @@
 }
 
 const raiseZombienet = async (): Promise<void> => {
-  const isUpgradeTesting = !!NEW_RELAY_BIN || !!NEW_RELAY_WASM || !!NEW_RELAY_BIN && !!NEW_PARA_WASM;
+  const isUpgradeTesting = !!NEW_RELAY_BIN || !!NEW_RELAY_WASM || !!NEW_PARA_BIN || !!NEW_PARA_WASM;
   /*
   // If there is nothing to upgrade, what is the point
   if (!isUpgradeTesting) {
@@ -120,18 +120,19 @@
 
   await cryptoWaitReady();
 
+  // Launch Zombienet!
+  network = await zombie.start(ZOMBIENET_CREDENTIALS, networkConfig, {silent: false});
+
   // Get the relay chain info like the epoch length and spec version
   // Then restart each parachain's binaries
   // // Stop and restart each node
   // // Send specified keys to parachain nodes in case the parachain requires it
   // If it is not needed to upgrade runtimes themselves, the job is done!
 
-  network = await zombie.start(ZOMBIENET_CREDENTIALS, networkConfig, {silent: false});
-
   // Record some required information regarding the relay chain
   await network.relay[0].connectApi();
   let relayInfo = getRelayInfo(network.relay[0].apiInstance!);
-  await network.relay[0].apiInstance?.disconnect();
+  await network.relay[0].apiInstance!.disconnect();
   if (isUpgradeTesting) {
     console.log('Relay stats:', relayInfo);
   }
@@ -172,6 +173,7 @@
 
         await node.restart();
         // applyaurakey?
+        // Zombienet handles it on first-time node creation
       }
     }