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 8c5d582..a75fa0e 100644
--- a/nitro-bridge-setup/templates/specs/bridge-nitro-spec.yml.j2
+++ b/nitro-bridge-setup/templates/specs/bridge-nitro-spec.yml.j2
@@ -11,10 +11,10 @@ config:
   TOKEN_NAME: {{ token_name }}
   TOKEN_SYMBOL: {{ token_symbol }}
   INITIAL_TOKEN_SUPPLY: {{ intial_token_supply }}
-  NA_ADDRESS: {{ na_address }}
-  VPA_ADDRESS: {{ vpa_address }}
-  CA_ADDRESS: {{ ca_address }}
-  L1_ASSET_ADDRESS: {{ l1_asset_address }}
+  NA_ADDRESS: "{{ na_address }}"
+  VPA_ADDRESS: "{{ vpa_address }}"
+  CA_ADDRESS: "{{ ca_address }}"
+  L1_ASSET_ADDRESS: "{{ l1_asset_address }}"
 network:
   ports:
     nitro-bridge:
diff --git a/nitro-contracts-setup/setup-vars.yml b/nitro-contracts-setup/setup-vars.yml
index 7762444..d1d497f 100644
--- a/nitro-contracts-setup/setup-vars.yml
+++ b/nitro-contracts-setup/setup-vars.yml
@@ -1,3 +1,3 @@
 target_host: "localhost"
-nitro_directory: ./out
+nitro_directory: out
 skip_container_build: false
diff --git a/nitro-nodes-setup/templates/configs/l1-nitro-config.env.j2 b/nitro-nodes-setup/templates/configs/l1-nitro-config.env.j2
index dc92e23..aca42b5 100644
--- a/nitro-nodes-setup/templates/configs/l1-nitro-config.env.j2
+++ b/nitro-nodes-setup/templates/configs/l1-nitro-config.env.j2
@@ -1,8 +1,8 @@
 NITRO_CHAIN_URL={{ nitro_l1_chain_url }}
 NITRO_SC_PK={{ nitro_sc_pk }}
 NITRO_CHAIN_PK={{ nitro_chain_pk }}
-NA_ADDRESS={{ na_address }}
-VPA_ADDRESS={{ vpa_address }}
-CA_ADDRESS={{ ca_address }}
+NA_ADDRESS="{{ na_address }}"
+VPA_ADDRESS="{{ vpa_address }}"
+CA_ADDRESS="{{ ca_address }}"
 NITRO_BOOTPEERS={{ nitro_l1_bridge_multiaddr }}
 NITRO_EXT_MULTIADDR={{ nitro_l1_ext_multiaddr }}
diff --git a/nitro-nodes-setup/templates/configs/l2-nitro-config.env.j2 b/nitro-nodes-setup/templates/configs/l2-nitro-config.env.j2
index be853b6..709a2ea 100644
--- a/nitro-nodes-setup/templates/configs/l2-nitro-config.env.j2
+++ b/nitro-nodes-setup/templates/configs/l2-nitro-config.env.j2
@@ -1,10 +1,10 @@
 NITRO_CHAIN_URL={{ nitro_l2_chain_url }}
 NITRO_SC_PK={{ nitro_sc_pk }}
 NITRO_CHAIN_PK={{ nitro_chain_pk }}
-NA_ADDRESS={{ na_address }}
-VPA_ADDRESS={{ vpa_address }}
-CA_ADDRESS={{ ca_address }}
-BRIDGE_ADDRESS={{ bridge_contract_address }}
+NA_ADDRESS="{{ na_address }}"
+VPA_ADDRESS="{{ vpa_address }}"
+CA_ADDRESS="{{ ca_address }}"
+BRIDGE_ADDRESS="{{ bridge_contract_address }}"
 NITRO_BOOTPEERS={{ nitro_l2_bridge_multiaddr }}
 NITRO_EXT_MULTIADDR={{ nitro_l2_ext_multiaddr }}
 NITRO_L2=true