diff --git a/taiko/alethia.env b/taiko/alethia.env
new file mode 100644
index 00000000..d30b7a1e
--- /dev/null
+++ b/taiko/alethia.env
@@ -0,0 +1,3 @@
+TAIKO_L1=0x06a9Ab27c7e2255df1815E6CC0168d7755Feb19a
+TAIKO_L2=0x1670000000000000000000000000000000010001
+
diff --git a/taiko/geth.env b/taiko/geth.env
deleted file mode 100644
index 7d2350a8..00000000
--- a/taiko/geth.env
+++ /dev/null
@@ -1,8 +0,0 @@
-TAIKO_ALETHIA_L1_ADDRESS=0x06a9Ab27c7e2255df1815E6CC0168d7755Feb19a
-TAIKO_HEKLA_L1_ADDRESS=0x79C9109b764609df928d16fC4a91e9081F7e87DB
-TAIKO_ALETHIA_L2_ADDRESS=0x1670000000000000000000000000000000010001
-TAIKO_HEKLA_L2_ADDRESS=0x1670090000000000000000000000000000010001
-TAIKO_ALETHIA_HOOK_ADDRESS=0x537a2f0D3a5879b41BCb5A2afE2EA5c4961796F6
-TAIKO_HEKLA_HOOK_ADDRESS=0x9e640a6aadf4f664CF467B795c31332f44AcBe6c
-TAIKO_ALETHIA_TOKEN_ADDRESS=0x10dea67478c5F8C5E2D90e5E9B26dBe60c54d800
-TAIKO_HEKLA_TOKEN_ADDRESS=0x6490E12d480549D333499236fF2Ba6676C296011
diff --git a/taiko/geth/taiko-alethia-geth-archive-leveldb-hash.yml b/taiko/geth/taiko-alethia-geth-archive-leveldb-hash.yml
index 0ddedcfa..14f41d55 100644
--- a/taiko/geth/taiko-alethia-geth-archive-leveldb-hash.yml
+++ b/taiko/geth/taiko-alethia-geth-archive-leveldb-hash.yml
@@ -56,7 +56,7 @@ services:
     depends_on:
       - taiko-alethia-archive
     env_file:
-      - ./taiko/geth.env
+      - ./taiko/alethia.env
     environment:
       #- "L1_ENDPOINT_HTTP=${ETHEREUM_MAINNET_EXECUTION_RPC}"
       #- "TAIKO_TOKEN_L1_ADDRESS=${TAIKO_ALETHIA_ARCHIVE_TOKEN_ADDRESS}"
diff --git a/taiko/geth/taiko-alethia-geth-pruned-pebble-path.yml b/taiko/geth/taiko-alethia-geth-pruned-pebble-path.yml
index c02c1fb6..6f2b6dee 100644
--- a/taiko/geth/taiko-alethia-geth-pruned-pebble-path.yml
+++ b/taiko/geth/taiko-alethia-geth-pruned-pebble-path.yml
@@ -56,7 +56,7 @@ services:
     depends_on:
       - taiko-alethia
     env_file:
-      - ./taiko/geth.env
+      - ./taiko/alethia.env
     environment:
       #- "L1_ENDPOINT_HTTP=${ETHEREUM_MAINNET_EXECUTION_RPC}"
       #- "TAIKO_TOKEN_L1_ADDRESS=${TAIKO_ALETHIA_TOKEN_ADDRESS}"
diff --git a/taiko/geth/taiko-hekla-geth-archive-leveldb-hash.yml b/taiko/geth/taiko-hekla-geth-archive-leveldb-hash.yml
index 51b71b2a..e7735b08 100644
--- a/taiko/geth/taiko-hekla-geth-archive-leveldb-hash.yml
+++ b/taiko/geth/taiko-hekla-geth-archive-leveldb-hash.yml
@@ -56,7 +56,7 @@ services:
     depends_on:
       - taiko-hekla-archive
     env_file:
-      - ./taiko/geth.env
+      - ./taiko/hekla.env
     environment:
       #- "L1_ENDPOINT_HTTP=${ETHEREUM_HOLESKY_EXECUTION_RPC}"
       #- "TAIKO_TOKEN_L1_ADDRESS=${TAIKO_HEKLA_ARCHIVE_TOKEN_ADDRESS}"
diff --git a/taiko/geth/taiko-hekla-geth-pruned-pebble-path.yml b/taiko/geth/taiko-hekla-geth-pruned-pebble-path.yml
index 448e342d..46076145 100644
--- a/taiko/geth/taiko-hekla-geth-pruned-pebble-path.yml
+++ b/taiko/geth/taiko-hekla-geth-pruned-pebble-path.yml
@@ -56,7 +56,7 @@ services:
     depends_on:
       - taiko-hekla
     env_file:
-      - ./taiko/geth.env
+      - ./taiko/hekla.env
     environment:
       #- "L1_ENDPOINT_HTTP=${ETHEREUM_HOLESKY_EXECUTION_RPC}"
       #- "TAIKO_TOKEN_L1_ADDRESS=${TAIKO_HEKLA_TOKEN_ADDRESS}"
diff --git a/taiko/hekla.env b/taiko/hekla.env
new file mode 100644
index 00000000..0f44ad47
--- /dev/null
+++ b/taiko/hekla.env
@@ -0,0 +1,2 @@
+TAIKO_L1=0x79C9109b764609df928d16fC4a91e9081F7e87DB
+TAIKO_L2=0x1670090000000000000000000000000000010001