diff --git a/Dockerfile-contracts b/Dockerfile-contracts
index 659fc520bfb5b..578e59db1b1de 100644
--- a/Dockerfile-contracts
+++ b/Dockerfile-contracts
@@ -8,6 +8,13 @@ RUN apt-get update && apt-get install -y \
     bash \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
+# Update certificates
+RUN apt-get update && apt-get install -y ca-certificates && update-ca-certificates
+
+# Set environment variables for Go
+ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
+ENV SSL_CERT_DIR=/etc/ssl/certs
+
 # Install foundry
 RUN curl -L https://foundry.paradigm.xyz | bash && \
     /root/.foundry/bin/foundryup && \
@@ -24,7 +31,7 @@ WORKDIR /app/packages/contracts-bedrock
 RUN git submodule update --init --recursive || echo "No submodules found"
 RUN --mount=type=cache,target=/root/.foundry \
     --mount=type=cache,target=/root/.cache \
-    forge build
+    forge build --skip "/**/test/**"
 
 # Build op-deployer
 WORKDIR /app
@@ -42,6 +49,13 @@ RUN --mount=type=cache,target=/root/.cache \
 FROM debian:bookworm-slim
 WORKDIR /app
 
+# Update certificates
+RUN apt-get update && apt-get install -y ca-certificates && update-ca-certificates
+
+# Set environment variables for Go
+ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
+ENV SSL_CERT_DIR=/etc/ssl/certs
+
 # Copy foundry tools for runtime use
 COPY --from=contracts-builder /usr/local/bin/forge /usr/local/bin/cast /usr/local/bin/anvil /usr/local/bin/
 
diff --git a/test/2-deploy-op-contracts.sh b/test/2-deploy-op-contracts.sh
index ee4dd33e31b0f..9c40e1ff1c892 100755
--- a/test/2-deploy-op-contracts.sh
+++ b/test/2-deploy-op-contracts.sh
@@ -8,9 +8,12 @@ source utils.sh
 
 ROOT_DIR=$(git rev-parse --show-toplevel)
 
+# Set global OP_CONTRACTS_IMAGE_TAG based on environment
 if [ "$ENV" = "local" ]; then
+    # Use local image tag for local environment
     DOCKER_NETWORK_ARG="$DOCKER_NETWORK"
 else
+    # Use cert image tag for non-local environments
     DOCKER_NETWORK_ARG="host"
 fi
 
@@ -58,7 +61,7 @@ deploy_transactor_contract() {
   FORGE_CMD="forge create --json --broadcast --legacy \
     --rpc-url $L1_RPC_URL_IN_DOCKER \
     --private-key $DEPLOYER_PRIVATE_KEY \
-    src/periphery/Transactor.sol:Transactor.0.8.30 \
+    src/periphery/Transactor.sol:Transactor \
     --constructor-args $ADMIN_OWNER_ADDRESS"
 
   echo "🔧 Executing Docker command..."
@@ -152,7 +155,13 @@ deploy_op_stack_bootstrap_implementations() {
 
   DOCKER_ARGS+=("$OP_CONTRACTS_IMAGE_TAG")
 
-  BASH_CMD="set -e && export CURL_CA_BUNDLE= && export GIT_SSL_NO_VERIFY=true && /app/op-deployer/bin/op-deployer bootstrap implementations --artifacts-locator file:///app/packages/contracts-bedrock/forge-artifacts --l1-rpc-url $L1_RPC_URL_IN_DOCKER --outfile /deployments/implementations.json --mips-version \"7\" --private-key $DEPLOYER_PRIVATE_KEY --protocol-versions-proxy $PROTOCOL_VERSIONS_PROXY --superchain-config-proxy $SUPERCHAIN_CONFIG_PROXY --superchain-proxy-admin $PROXY_ADMIN --upgrade-controller $ADMIN_OWNER_ADDRESS --challenger $CHALLENGER_ADDRESS --challenge-period-seconds $CHALLENGE_PERIOD_SECONDS --withdrawal-delay-seconds $WITHDRAWAL_DELAY_SECONDS --proof-maturity-delay-seconds $PROOF_MATURITY_DELAY_SECONDS --dispute-game-finality-delay-seconds $DISPUTE_GAME_FINALITY_DELAY_SECONDS --dev-feature-bitmap 0x0000000000000000000000000000000000000000000000000000000000001000"
+  # Build the base command
+  BASH_CMD="set -e && export CURL_CA_BUNDLE= && export GIT_SSL_NO_VERIFY=true && /app/op-deployer/bin/op-deployer bootstrap implementations --artifacts-locator file:///app/packages/contracts-bedrock/forge-artifacts --l1-rpc-url $L1_RPC_URL_IN_DOCKER --outfile /deployments/implementations.json --mips-version \"7\" --private-key $DEPLOYER_PRIVATE_KEY --protocol-versions-proxy $PROTOCOL_VERSIONS_PROXY --superchain-config-proxy $SUPERCHAIN_CONFIG_PROXY --superchain-proxy-admin $PROXY_ADMIN --upgrade-controller $ADMIN_OWNER_ADDRESS --challenger $CHALLENGER_ADDRESS --challenge-period-seconds $CHALLENGE_PERIOD_SECONDS --withdrawal-delay-seconds $WITHDRAWAL_DELAY_SECONDS --proof-maturity-delay-seconds $PROOF_MATURITY_DELAY_SECONDS --dispute-game-finality-delay-seconds $DISPUTE_GAME_FINALITY_DELAY_SECONDS"
+
+  # Add dev-feature-bitmap only when CGT_ENABLED=true
+  if [ "$CGT_ENABLED" = "true" ]; then
+    BASH_CMD="$BASH_CMD --dev-feature-bitmap 0x0000000000000000000000000000000000000000000000000000000000001000"
+  fi
 
   docker run "${DOCKER_ARGS[@]}" bash -c "$BASH_CMD"
 
@@ -240,6 +249,8 @@ deploy_custom_gas_token() {
 
 }
 
+echo "CGT_ENABLED: ${CGT_ENABLED}"
+
 cp ./config-op/intent.${ENV}.toml.bak ./config-op/intent.toml
 cp ./config-op/state.json.bak ./config-op/state.json
 
@@ -252,4 +263,6 @@ deploy_op_stack_bootstrap_superchain
 deploy_op_stack_bootstrap_implementations
 deploy_op_stack_contracts
 
-deploy_custom_gas_token
+if [ "$CGT_ENABLED" = "true" ]; then
+  deploy_custom_gas_token
+fi
diff --git a/test/4-migrate-op.sh b/test/4-migrate-op.sh
index d3a50af29e9f6..7e1caff206ce5 100755
--- a/test/4-migrate-op.sh
+++ b/test/4-migrate-op.sh
@@ -30,7 +30,6 @@ prepare() {
 
   jq '.config.legacyXLayerBlock = '"$FORK_BLOCK" ./config-op/genesis.json > temp_genesis.json && mv temp_genesis.json ./config-op/genesis.json
   sed_inplace 's/"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000"/"parentHash": "'"$PARENT_HASH"'"/' ./config-op/genesis.json
-  sed_inplace '/"70997970c51812dc3a010c7d01b50e0d17dc79c8": {/,/}/ s/"balance": "[^"]*"/"balance": "0x446c3b15f9926687d2c40534fdb564000000000000"/' config-op/genesis.json
   jq '.genesis.l2.number = '"$FORK_BLOCK" ./config-op/rollup.json > temp_rollup.json && mv temp_rollup.json ./config-op/rollup.json
 
   cp ./config-op/genesis.json ./config-op/genesis-op-after-number.json
diff --git a/test/Makefile b/test/Makefile
index cd42e87416c3d..42731c062c2e7 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -142,6 +142,9 @@ clean: stop
 	rm -rf config-op/rollup.json
 	rm -rf config-op/state.json
 	rm -rf config-op/superchain.json
+	rm -rf config-op/genesis-op-before-number.json
+	rm -rf config-op/genesis-op-after-number.json
+	rm -rf config-op/merged.genesis.gz.json
 	rm -rf config-op/196-*
 	rm -rf config-op/195-*
 	rm -rf config-op/1952-*
@@ -150,7 +153,8 @@ clean: stop
 	rm -rf l1-geth/consensus/validatordata/
 	rm -rf l1-geth/execution/genesis.json
 	rm -rf l1-geth/execution/geth/
-	rm -rf init.log
+	rm -rf merged.genesis.json
+	rm -rf migrate.log
 	rm -rf .env
 
 .PHONY: run
diff --git a/test/build_images.sh b/test/build_images.sh
index fcab8f2c7cc2d..260f02c932bed 100755
--- a/test/build_images.sh
+++ b/test/build_images.sh
@@ -193,7 +193,7 @@ build_op_stack_contract() {
     cp $PWD_DIR/contracts/Transactor.sol ../packages/contracts-bedrock/src/periphery/Transactor.sol
 
     cd ..
-    docker build --platform $ARCH -t $OP_CONTRACTS_IMAGE_TAG -f Dockerfile-contracts .
+    docker build $( [ "$FORCE" = true ] && echo --no-cache ) --platform $ARCH -t $OP_CONTRACTS_IMAGE_TAG -f Dockerfile-contracts .
 
     cd $PWD_DIR
 
diff --git a/test/clean.sh b/test/clean.sh
deleted file mode 100755
index 1f85bbfe68591..0000000000000
--- a/test/clean.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-set -e
-
-echo " 🧹 Cleaning up Optimism test environment..."
-
-echo " 📦 Stopping Docker containers..."
-[ -f .env ] && docker compose down
-
-echo " 🗑️  Removing generated files..."
-rm -rf data
-rm -rf config-op/genesis.json
-rm -rf config-op/genesis.json.gz
-rm -rf config-op/implementations.json
-rm -rf config-op/intent.toml
-rm -rf config-op/rollup.json
-rm -rf config-op/state.json
-rm -rf config-op/superchain.json
-rm -rf config-op/195-*
-rm -rf l1-geth/consensus/beacondata/
-rm -rf l1-geth/consensus/genesis.ssz
-rm -rf l1-geth/consensus/validatordata/
-rm -rf l1-geth/execution/genesis.json
-rm -rf l1-geth/execution/geth/
-rm -rf init.log
-
-echo " ✅ Cleanup completed!"
diff --git a/test/config/aggkit.toml b/test/config/aggkit.toml
index e6eb89537fd29..52019ae5a38c0 100644
--- a/test/config/aggkit.toml
+++ b/test/config/aggkit.toml
@@ -19,9 +19,9 @@ AggregatorPrivateKeyPassword  = "testonly"
 SenderProofToL1Addr = "0x70997970c51812dc3a010c7d01b50e0d17dc79c8"
 polygonBridgeAddr = "0xb2fAc1CE54bb9BF77A7FE106fA69F81453b72851"
 
-rollupCreationBlockNumber = "96"
-rollupManagerCreationBlockNumber = "105"
-genesisBlockNumber = "96"
+rollupCreationBlockNumber = "93"
+rollupManagerCreationBlockNumber = "102"
+genesisBlockNumber = "93"
 
 [Common]
 NetworkID = 1
diff --git a/test/config/dynamic-mynetwork-conf.json b/test/config/dynamic-mynetwork-conf.json
index 1bb009b0dffd1..d95c68a7fd48d 100644
--- a/test/config/dynamic-mynetwork-conf.json
+++ b/test/config/dynamic-mynetwork-conf.json
@@ -1,6 +1,6 @@
 {
   "root": "0x6565265b546acdc3b714218d5bdb667725002a6fa07b5045f5ed4ad7595ebd62",
-  "timestamp": 1760436338,
+  "timestamp": 1760520703,
   "gasLimit": 0,
   "difficulty": 0
 }
diff --git a/test/config/first-batch-config.json b/test/config/first-batch-config.json
index 2163c202ad27b..d5cdf53482ee5 100644
--- a/test/config/first-batch-config.json
+++ b/test/config/first-batch-config.json
@@ -1,9 +1,9 @@
 {
   "batchL2Data": "0xf901e480808401c9c38094b2fac1ce54bb9bf77a7fe106fa69f81453b7285180b901c4f811bff700000000000000000000000000000000000000000000000000000000000000010000000000000000000000005fbdb2315678afecb367f032d93f642f64180aa30000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a40d5f56745a118d0906a34e69aec8c0db1cb8fa000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000084f4b42546f6b656e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000034f4b42000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005ca1ab1e0000000000000000000000000000000000000000000000000000000005ca1ab1e1bff",
   "globalExitRoot": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5",
-  "timestamp": 1760436338,
+  "timestamp": 1760520703,
   "sequencer": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
-  "l1BlockNumber": 105,
-  "l1BlockHash": "0xddf01344a39e4a7eefb02e1594abe59267a81847fe9ce2439b8c721f782a1dea",
-  "l1ParentHash": "0x671bfe2c50d0f6e9bfb56edd463505e07ef2511aec8c0f4bdecb180b112bdd1d"
+  "l1BlockNumber": 102,
+  "l1BlockHash": "0x4ac541460183187d42d4506f23d0b45446cdb768c1d617a5f4d437ceac979151",
+  "l1ParentHash": "0x23e6bc6faaa8c55cee0549f26121b77c63ac189dc1bfc1444027102cfbf7a024"
 }
diff --git a/test/config/test.erigon.seq.config.yaml b/test/config/test.erigon.seq.config.yaml
index 3fbe42c2ee0d7..f42c05543ecfa 100644
--- a/test/config/test.erigon.seq.config.yaml
+++ b/test/config/test.erigon.seq.config.yaml
@@ -16,7 +16,7 @@ zkevm.address-rollup: "0xE96dBF374555C6993618906629988d39184716B3"
 zkevm.address-ger-manager: "0xB8cedD4B9eF683f0887C44a6E4312dC7A6e2fcdB"
 
 zkevm.l1-rollup-id: 1
-zkevm.l1-first-block: 96
+zkevm.l1-first-block: 93
 zkevm.l1-block-range: 10
 zkevm.l1-query-delay: 6000
 zkevm.rpc-ratelimit: 0
diff --git a/test/config/test.genesis.config.json b/test/config/test.genesis.config.json
index b44ff4e61fe00..6df8349a3179b 100644
--- a/test/config/test.genesis.config.json
+++ b/test/config/test.genesis.config.json
@@ -6,9 +6,9 @@
         "polTokenAddress": "0x5FbDB2315678afecb367f032d93F642f64180aa3",
         "polygonZkEVMGlobalExitRootAddress": "0xB8cedD4B9eF683f0887C44a6E4312dC7A6e2fcdB"
     },
-    "genesisBlockNumber": 96,
-    "rollupCreationBlockNumber": 105,
-    "rollupManagerCreationBlockNumber": 96,
+    "genesisBlockNumber": 93,
+    "rollupCreationBlockNumber": 102,
+    "rollupManagerCreationBlockNumber": 93,
     "root": "0xef7bb96e820d4d8440f9bae6b1d58427c06e324ac9d5f7a5156438dd42e837c5",
  "genesis": [
   {
diff --git a/test/docker-compose-local.yml b/test/docker-compose-local.yml
index 1a279fe773820..a460e1e4b75d6 100644
--- a/test/docker-compose-local.yml
+++ b/test/docker-compose-local.yml
@@ -563,7 +563,7 @@ services:
       - ./config-op/rollup.json:/rollup.json
     ports:
       - "8547:8547"  # RPC port
-      - "50050:50050"  # Consensus port
+#      - "50050:50050"  # Consensus port
     command:
       - /app/op-conductor/bin/op-conductor
       - --log.level=debug
@@ -766,7 +766,7 @@ services:
       - ./config-op/rollup.json:/rollup.json
     ports:
       - "8548:8547"  # RPC port
-      - "50051:50050"  # Consensus port
+#      - "50051:50050"  # Consensus port
     command:
       - /app/op-conductor/bin/op-conductor
       - --log.level=debug
@@ -879,7 +879,7 @@ services:
       - ./config-op/rollup.json:/rollup.json
     ports:
       - "8549:8547"  # RPC port
-      - "50052:50050"  # Consensus port
+#      - "50052:50050"  # Consensus port
     command:
       - /app/op-conductor/bin/op-conductor
       - --log.level=debug
diff --git a/test/dockerfile/Dockerfile-contract-certs b/test/dockerfile/Dockerfile-contract-certs
deleted file mode 100644
index 9ddc25d43e9ec..0000000000000
--- a/test/dockerfile/Dockerfile-contract-certs
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM op-contracts:v1.14.1-pre-release
-
-# Update certificates
-RUN apt-get update && apt-get install -y ca-certificates && update-ca-certificates
-
-# Set environment variables for Go
-ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
-ENV SSL_CERT_DIR=/etc/ssl/certs
\ No newline at end of file
diff --git a/test/example.env b/test/example.env
deleted file mode 100644
index 076f6ef311795..0000000000000
--- a/test/example.env
+++ /dev/null
@@ -1,68 +0,0 @@
-OP_GETH_LOCAL_DIRECTORY=
-OP_GETH_BRANCH=
-SKIP_OP_STACK_BUILD=false
-SKIP_OP_CONTRACTS_BUILD=false
-SKIP_OP_GETH_BUILD=false
-
-OP_GETH_IMAGE_TAG=op-geth:latest
-OP_STACK_IMAGE_TAG=op-stack:latest
-OP_CONTRACTS_IMAGE_TAG=op-contracts:latest
-
-DOCKER_NETWORK=dev-op
-CONFIG_DIR=config-op
-
-CHAIN_ID=196
-
-RICH_L1_PRIVATE_KEY=0x4bbbf85ce3377467afe5d46f804f221813b2bb87f24d81f60f1fcdbf7cbf4356
-
-L1_RPC_URL=http://localhost:8545
-L2_RPC_URL=http://localhost:8124
-L1_RPC_URL_IN_DOCKER=http://l1-geth:8545
-L2_RPC_URL=http://localhost:8123
-L2_RPC_URL_IN_DOCKER=http://op-geth-seq:8545
-L1_BEACON_URL_IN_DOCKER=http://l1-beacon-chain:3500
-
-TRANSACTOR=0x162a433068f51e18b7d13932f27e66a3f99e6890
-
-DEPLOYER_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
-SEQUENCER_P2P_KEY=0x8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba
-OP_BATCHER_PRIVATE_KEY=0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a
-OP_PROPOSER_PRIVATE_KEY=0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d
-OP_CHALLENGER_PRIVATE_KEY=0x8b3a350cf5c34c9194ca9aa3f146b2b9afed22cd83d3c5f6a3f2f243ce220c01
-
-L2OO_ADDRESS=0x0000000000000000000000000000000000000000
-DISPUTE_GAME_FACTORY_ADDRESS=0x9fb19f214e8ec1c84c25eb954183bdd6b8d5032e
-ADMIN_OWNER_ADDRESS=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
-OPCM_IMPL_ADDRESS=0xd5ea6d3f520eac42f989019a8d3c51a123e73113
-SYSTEM_CONFIG_PROXY_ADDRESS=0x330cff9f99a75bc9c71750b5c60fdc0eff1789e1
-PROXY_ADMIN=0x922d6956c99e12dfeb3224dea977d0939758a1fe
-PROPOSER_ADDRESS=0x70997970C51812dc3A010C7d01b50e0d17dc79C8
-OPTIMISM_PORTAL_PROXY_ADDRESS=0xc8e8b7b181db301f27aef90ed285787a3ce179e9
-
-# First game only for update anchor root
-TEMP_MAX_CLOCK_DURATION=40
-TEMP_CLOCK_EXTENSION=5
-TEMP_GAME_WINDOW=60
-
-# Game config
-MAX_CLOCK_DURATION=20
-CLOCK_EXTENSION=10
-GAME_WINDOW=60
-
-# AnchorStateRegistry configure
-DISPUTE_GAME_FINALITY_DELAY_SECONDS=5
-
-# PreimageOracle configure
-CHALLENGE_PERIOD_SECONDS=10
-
-# WETH configure
-WITHDRAWAL_DELAY_SECONDS=$MAX_CLOCK_DURATION
-
-# TODO: use real fork block and parent hash in xlayer erigon
-FORK_BLOCK=8593920
-PARENT_HASH="0x6912fea590fd46ca6a63ec02c6733f6ffb942b84cdf86f7894c21e1757a1f68a"
-
-DB_ENGINE="pebble"
-
-CONDUCTOR_ENABLED=true
-LAUNCH_RPC_NODE=true
diff --git a/test/init.sh b/test/init.sh
deleted file mode 100755
index af9f9a6f49800..0000000000000
--- a/test/init.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-set -x
-set -e
-
-BRANCH_NAME=${1:-""}
-PWD_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-OPTIMISM_DIR=$(git rev-parse --show-toplevel)
-
-[ ! -f .env ] && cp example.env .env
-
-source .env
-
-if [ "$OP_GETH_LOCAL_DIRECTORY" = "" ]; then
-    git submodule update --init --recursive
-    OP_GETH_DIR="$OPTIMISM_DIR/op-geth"
-else
-    OP_GETH_DIR="$OP_GETH_LOCAL_DIRECTORY"
-fi
-
-# Switch to specified branch if provided
-if [ -n "$BRANCH_NAME" ]; then
-    echo "Switching op-geth to branch: $BRANCH_NAME"
-    cd $OP_GETH_DIR
-    git fetch origin
-    git checkout "$BRANCH_NAME"
-    git pull origin "$BRANCH_NAME"
-    cd "$PWD_DIR"
-else
-    echo "Using op-geth default branch"
-fi
-
-# TODO: need to further confirm why it fails if we do not add require in this contract
-cp $PWD_DIR/contracts/Transactor.sol $OPTIMISM_DIR/packages/contracts-bedrock/src/periphery/Transactor.sol
-
-cd $OPTIMISM_DIR
-
-# Build OP_CONTRACTS image if not skipping
-if [ $SKIP_OP_CONTRACTS_BUILD = "true" ]; then
-    echo "skipping op-contracts build"
-else
-    echo "Building $OP_CONTRACTS_IMAGE_TAG..."
-    docker build -t $OP_CONTRACTS_IMAGE_TAG -f ./Dockerfile-contracts .
-fi
-
-# Build OP_STACK image if not skipping
-if [ $SKIP_OP_STACK_BUILD = "true" ]; then
-    echo "skipping op-stack build"
-else
-    echo "Building $OP_STACK_IMAGE_TAG..."
-    docker build -t $OP_STACK_IMAGE_TAG -f ./Dockerfile-opstack .
-fi
-
-# Build OP_GETH image if not skipping
-if [ $SKIP_OP_GETH_BUILD = "true" ]; then
-    echo "skipping op-geth build"
-else
-    echo "Building $OP_GETH_IMAGE_TAG"
-    cd $OP_GETH_DIR
-    docker build -t $OP_GETH_IMAGE_TAG .
-fi
diff --git a/test/local.env b/test/local.env
index 4bb12fb02d11d..c4b485fb9771f 100644
--- a/test/local.env
+++ b/test/local.env
@@ -1,15 +1,18 @@
 ENV=local
+
 CONDUCTOR_ENABLED=true
+CGT_ENABLED=true
+
 CHAIN_ID=195
 
 DOCKER_NETWORK=pp-op
 CONFIG_DIR=config-op
 
 # Images
-OP_GETH_MIGRATION_IMAGE_TAG=op-geth:v1.101603.1-rc.1-dev-op
+OP_GETH_MIGRATION_IMAGE_TAG=op-geth-migrate:latest
 OP_GETH_IMAGE_TAG=op-geth:latest
 OP_STACK_IMAGE_TAG=op-stack:latest
-OP_CONTRACTS_IMAGE_TAG=op-contracts:v1.14.1-pre-release-cert
+OP_CONTRACTS_IMAGE_TAG=op-contract:latest
 XLAYER_BRIDGE_SERVICE_IMAGE_TAG=hermeznetwork/zkevm-bridge-service:v0.6.0-RC16-patch
 CDK_ERIGON_IMAGE_TAG=cdk-erigon:latest
 
diff --git a/test/testnet.env b/test/testnet.env
index d7497c815a3dc..1c9a26903dd13 100644
--- a/test/testnet.env
+++ b/test/testnet.env
@@ -1,18 +1,26 @@
 ENV=testnet
+
 CONDUCTOR_ENABLED=true
+CGT_ENABLED=true
+
 CHAIN_ID=1952
 
 DOCKER_NETWORK=pp-op
 CONFIG_DIR=config-op
 
 # Images
-OP_GETH_MIGRATION_IMAGE_TAG=op-geth:v1.101603.1-rc.1-dev-op
-OP_GETH_IMAGE_TAG=op-geth:v1.101603.1-rc.1-sync-optimism
-OP_STACK_IMAGE_TAG=op-stack:v1.14.1-pre-release
-OP_CONTRACTS_IMAGE_TAG=op-contracts:v1.14.1-pre-release-cert
+OP_GETH_MIGRATION_IMAGE_TAG=op-geth-migrate:latest
+OP_GETH_IMAGE_TAG=op-geth:latest
+OP_STACK_IMAGE_TAG=op-stack:latest
+OP_CONTRACTS_IMAGE_TAG=op-contract:latest
 XLAYER_BRIDGE_SERVICE_IMAGE_TAG=hermeznetwork/zkevm-bridge-service:v0.6.0-RC16-patch
 CDK_ERIGON_IMAGE_TAG=cdk-erigon:latest
 
+OP_GETH_DATADIR=./data/op-geth-seq
+OP_GETH_DATADIR2=./data/op-geth-seq2
+OP_GETH_DATADIR3=./data/op-geth-seq3
+OP_GETH_RPC_DATADIR=./data/op-geth-rpc
+
 # RPC endpoints
 L1_RPC_URL=https://eth-sepolia.g.alchemy.com/v2/guRQTmAsXOqUpWvemmQIH
 L2_RPC_URL=http://127.0.0.1:8124