diff --git a/nitro-bridge-setup/bridge-vars-example.yml b/nitro-bridge-setup/bridge-vars-example.yml
index 272ab93..2d73692 100644
--- a/nitro-bridge-setup/bridge-vars-example.yml
+++ b/nitro-bridge-setup/bridge-vars-example.yml
@@ -2,7 +2,7 @@ nitro_l1_chain_url: ""
 nitro_l2_chain_url: ""
 nitro_chain_pk: ""
 nitro_sc_pk: ""
-geth_chain_id: ""
+optimism_chain_id: ""
 geth_url: ""
 optimism_url: ""
 optimism_deployer_pk: ""
diff --git a/nitro-bridge-setup/deploy-contracts.yml b/nitro-bridge-setup/deploy-contracts.yml
index d31d39e..587495e 100644
--- a/nitro-bridge-setup/deploy-contracts.yml
+++ b/nitro-bridge-setup/deploy-contracts.yml
@@ -64,7 +64,7 @@
         timeout: 60
 
     - name: Export NA_ADDRESS
-      shell: laconic-so deployment --dir nitro-contracts-deployment exec nitro-contracts "jq -r '.\"1212\"[0].contracts.NitroAdjudicator.address' /app/deployment/nitro-addresses.json"
+      shell: laconic-so deployment --dir nitro-contracts-deployment exec nitro-contracts "jq -r '.\"{{ geth_chain_id }}\"[0].contracts.NitroAdjudicator.address' /app/deployment/nitro-addresses.json"
       args:
         chdir: "{{ nitro_directory }}"
       register: na_address
@@ -72,7 +72,7 @@
         msg: "NA_ADDRESS: {{ na_address.stdout }}"
 
     - name: Export CA_ADDRESS
-      shell: laconic-so deployment --dir nitro-contracts-deployment exec nitro-contracts "jq -r '.\"1212\"[0].contracts.ConsensusApp.address' /app/deployment/nitro-addresses.json"
+      shell: laconic-so deployment --dir nitro-contracts-deployment exec nitro-contracts "jq -r '.\"{{ geth_chain_id }}\"[0].contracts.ConsensusApp.address' /app/deployment/nitro-addresses.json"
       args:
         chdir: "{{ nitro_directory }}"
       register: ca_address
@@ -80,7 +80,7 @@
         msg: "CA_ADDRESS: {{ ca_address.stdout }}"
 
     - name: Export VPA_ADDRESS
-      shell: laconic-so deployment --dir nitro-contracts-deployment exec nitro-contracts "jq -r '.\"1212\"[0].contracts.VirtualPaymentApp.address' /app/deployment/nitro-addresses.json"
+      shell: laconic-so deployment --dir nitro-contracts-deployment exec nitro-contracts "jq -r '.\"{{ geth_chain_id }}\"[0].contracts.VirtualPaymentApp.address' /app/deployment/nitro-addresses.json"
       args:
         chdir: "{{ nitro_directory }}"
       register: vpa_address
@@ -88,16 +88,9 @@
         msg: "VPA_ADDRESS: {{ vpa_address.stdout }}"
 
     - name: Export L1_ASSET_ADDRESS
-      shell: laconic-so deployment --dir nitro-contracts-deployment exec nitro-contracts "jq -r '.\"1212\"[0].contracts.Token.address' /app/deployment/nitro-addresses.json"
+      shell: laconic-so deployment --dir nitro-contracts-deployment exec nitro-contracts "jq -r '.\"{{ geth_chain_id }}\"[0].contracts.Token.address' /app/deployment/nitro-addresses.json"
       args:
         chdir: "{{ nitro_directory }}"
       register: l1_asset_address
     - debug:
         msg: "L1_ASSET_ADDRESS: {{ l1_asset_address.stdout }}"
-
-    - name: Set contract addresses
-      set_fact:
-        na_address: "{{ na_address.stdout }}"
-        ca_address: "{{ ca_address.stdout }}"
-        vpa_address: "{{ vpa_address.stdout }}"
-        l1_asset_address: "{{ l1_asset_address.stdout }}"
diff --git a/nitro-bridge-setup/run-nitro-bridge.yml b/nitro-bridge-setup/run-nitro-bridge.yml
index e3d02ff..e601abc 100644
--- a/nitro-bridge-setup/run-nitro-bridge.yml
+++ b/nitro-bridge-setup/run-nitro-bridge.yml
@@ -65,7 +65,7 @@
         timeout: 60
 
     - name: Print BRIDGE_ADDRESS
-      shell: laconic-so deployment --dir bridge-deployment exec nitro-bridge "jq -r '.\"42069\"[0].contracts.Bridge.address' /app/deployment/nitro-addresses.json"
+      shell: laconic-so deployment --dir bridge-deployment exec nitro-bridge "jq -r '.\"{{ optimism_chain_id }}\"[0].contracts.Bridge.address' /app/deployment/nitro-addresses.json"
       args:
         chdir: "{{ nitro_directory }}"
       register: bridge_address
diff --git a/nitro-bridge-setup/templates/specs/bridge-nitro-spec.yml.j2 b/nitro-bridge-setup/templates/specs/bridge-nitro-spec.yml.j2
index a37c083..5831097 100644
--- a/nitro-bridge-setup/templates/specs/bridge-nitro-spec.yml.j2
+++ b/nitro-bridge-setup/templates/specs/bridge-nitro-spec.yml.j2
@@ -6,6 +6,7 @@ config:
   NITRO_CHAIN_PK: {{ nitro_chain_pk }}
   NITRO_SC_PK: {{ nitro_sc_pk }}
   GETH_URL: {{ geth_url }}
+  OPTIMISM_CHAIN_ID: {{ optimism_chain_id }}
   OPTIMISM_URL: {{ optimism_url }}
   OPTIMISM_DEPLOYER_PK: {{ optimism_deployer_pk }}
   TOKEN_NAME: {{ token_name }}