diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 15e78b580d..5d5b38ecfa 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -615,17 +615,6 @@ jobs:
           docker create --name moonbeam_container $DOCKER_TAG bash
           docker cp moonbeam_container:moonbeam/moonbeam test/tmp/moonbeam_rt
           docker rm -f moonbeam_container
-      - name: "TEMPORARY: Download forked polkadot-bins"
-        run: |
-          # When we remove this step, re-add "runScripts": ["download-polkadot.sh"]," to moonwall config
-          cd test/tmp
-          wget https://opslayer-dev-artifacts.s3.us-east-2.amazonaws.com/bins/moonbeam/polkadot/1.3.0/polkadot
-          wget https://opslayer-dev-artifacts.s3.us-east-2.amazonaws.com/bins/moonbeam/polkadot/1.3.0/polkadot-execute-worker
-          wget https://opslayer-dev-artifacts.s3.us-east-2.amazonaws.com/bins/moonbeam/polkadot/1.3.0/polkadot-prepare-worker
-
-          chmod +x polkadot
-          chmod +x polkadot-execute-worker
-          chmod +x polkadot-prepare-worker
       - name: Prepare Chainspecs
         run: |
           cd test
diff --git a/test/scripts/modify-plain-specs.ts b/test/scripts/modify-plain-specs.ts
index 7227b7e46e..434ba04a41 100644
--- a/test/scripts/modify-plain-specs.ts
+++ b/test/scripts/modify-plain-specs.ts
@@ -38,10 +38,20 @@ yargs(hideBin(process.argv))
       process.stdout.write("Done ✅\n");
 
       plainSpec.bootNodes = [];
-      plainSpec.genesis.runtime.authorMapping.mappings = [
-        ["5HEL3iLyDyaqmfibHXAXVzyQq4fBqLCHGMEYxZXgRAuhEKXX", ALITH_ADDRESS],
-      ];
-      plainSpec.genesis.runtime.openTechCommitteeCollective.members = [ALITH_ADDRESS];
+      if ("runtimeGenesis" in plainSpec.genesis) {
+        plainSpec.genesis.runtimeGenesis.config.authorMapping.mappings = [
+          ["5HEL3iLyDyaqmfibHXAXVzyQq4fBqLCHGMEYxZXgRAuhEKXX", ALITH_ADDRESS],
+        ];
+
+        plainSpec.genesis.runtimeGenesis.config.openTechCommitteeCollective.members = [
+          ALITH_ADDRESS,
+        ];
+      } else {
+        plainSpec.genesis.runtime.authorMapping.mappings = [
+          ["5HEL3iLyDyaqmfibHXAXVzyQq4fBqLCHGMEYxZXgRAuhEKXX", ALITH_ADDRESS],
+        ];
+        plainSpec.genesis.runtime.openTechCommitteeCollective.members = [ALITH_ADDRESS];
+      }
 
       process.stdout.write(`Writing to: ${argv.outputPath} ...`);
       await fs.writeFile(