diff --git a/ci/e2e.sh b/ci/e2e.sh
index aff85b07af..6e9c037f05 100755
--- a/ci/e2e.sh
+++ b/ci/e2e.sh
@@ -33,30 +33,6 @@ echo "Add keys for chains"
 echo "-----------------------------------------------------------------------------------------------------------------"
 hermes -c "$CONFIG_PATH" keys add "$CHAIN_A" key_seed_"$CHAIN_A".json
 hermes -c "$CONFIG_PATH" keys add "$CHAIN_B" key_seed_"$CHAIN_B".json
-echo "-----------------------------------------------------------------------------------------------------------------"
-echo "Set the primary peers for clients on each chain                                                                  "
-echo "-----------------------------------------------------------------------------------------------------------------"
-LIGHT_ADD_CHAIN_A="hermes -c $CONFIG_PATH light add http://$CHAIN_A:$CHAIN_A_PORT -c $CHAIN_A -s $CHAIN_A_HOME -p -y -f"
-echo "Executing: $LIGHT_ADD_CHAIN_A"
-bash -c "$LIGHT_ADD_CHAIN_A"
-sleep 2
-echo "-----------------------------------------------------------------------------------------------------------------"
-LIGHT_ADD_CHAIN_B="hermes -c $CONFIG_PATH light add http://$CHAIN_B:$CHAIN_B_PORT -c $CHAIN_B -s $CHAIN_B_HOME -p -y -f"
-echo "Executing: $LIGHT_ADD_CHAIN_B"
-bash -c "$LIGHT_ADD_CHAIN_B"
-sleep 2
-echo "-----------------------------------------------------------------------------------------------------------------"
-echo "Set the secondary peers for clients on each chain                                                                "
-echo "-----------------------------------------------------------------------------------------------------------------"
-LIGHT_ADD_CHAIN_A_PEER="hermes -c $CONFIG_PATH light add http://$CHAIN_A:$CHAIN_A_PORT -c $CHAIN_A -s $CHAIN_A_HOME --peer-id 17D46D8C1576A79203A6733F63B2C9B7235DD559 -y"
-echo "Executing: $LIGHT_ADD_CHAIN_A_PEER"
-bash -c "$LIGHT_ADD_CHAIN_A_PEER"
-sleep 2
-echo "-----------------------------------------------------------------------------------------------------------------"
-LIGHT_ADD_CHAIN_B_PEER="hermes -c $CONFIG_PATH light add http://$CHAIN_B:$CHAIN_B_PORT -c $CHAIN_B -s $CHAIN_B_HOME --peer-id A885BB3D3DFF6101188B462466AE926E7A6CD51E -y"
-echo "Executing: $LIGHT_ADD_CHAIN_B_PEER"
-bash -c "$LIGHT_ADD_CHAIN_B_PEER"
-sleep 2
 
 echo "================================================================================================================="
 echo "                                             END-TO-END TESTS                                                    "
diff --git a/scripts/init-clients b/scripts/init-clients
index 5843247686..27dbcd858f 100755
--- a/scripts/init-clients
+++ b/scripts/init-clients
@@ -68,33 +68,6 @@ CHAIN_2_RPC_ADDR="http://127.0.0.1:$CHAIN_2_RPC_PORT"
 echo "Building the Rust relayer..."
 cargo build -q
 
-# cleanup the client entries from config
-echo "Removing light client peers from configuration..."
-cargo run -q --bin hermes -- -c "$CONFIG_FILE" light rm -c "$CHAIN_0_ID" --all -y || true
-cargo run -q --bin hermes -- -c "$CONFIG_FILE" light rm -c "$CHAIN_1_ID" --all -y || true
-
-if [ -n "$CHAIN_2_ID" ]; then
-  cargo run -q --bin hermes -- -c "$CONFIG_FILE" light rm -c "$CHAIN_2_ID" --all -y || true
-fi
-
-# set the primary peers for clients on each chain
-echo "Adding primary peers to light client configuration..."
-cargo run -q --bin hermes -- -c "$CONFIG_FILE" light add $CHAIN_0_RPC_ADDR -c "$CHAIN_0_ID" -f -p -s "$GAIA_DATA/$CHAIN_0_ID/data" -y
-cargo run -q --bin hermes -- -c "$CONFIG_FILE" light add $CHAIN_1_RPC_ADDR -c "$CHAIN_1_ID" -f -p -s "$GAIA_DATA/$CHAIN_1_ID/data" -y
-
-if [ -n "$CHAIN_2_ID" ]; then
-  cargo run -q --bin hermes -- -c "$CONFIG_FILE" light add $CHAIN_2_RPC_ADDR -c "$CHAIN_2_ID" -f -p -s "$GAIA_DATA/$CHAIN_2_ID/data" -y
-fi
-
-# set the secondary peers for clients on each chain
-echo "Adding secondary peers to light client configuration..."
-cargo run -q --bin hermes -- -c "$CONFIG_FILE" light add $CHAIN_0_RPC_ADDR -c "$CHAIN_0_ID" -s "$GAIA_DATA/$CHAIN_0_ID/data" -y --peer-id 2427F8D914A6862279B3326FA64F76E3BC06DB2E
-cargo run -q --bin hermes -- -c "$CONFIG_FILE" light add $CHAIN_1_RPC_ADDR -c "$CHAIN_1_ID" -s "$GAIA_DATA/$CHAIN_1_ID/data" -y --peer-id A885BB3D3DFF6101188B462466AE926E7A6CD51E
-
-if [ -n "$CHAIN_2_ID" ]; then
-  cargo run -q --bin hermes -- -c "$CONFIG_FILE" light add $CHAIN_2_RPC_ADDR -c "$CHAIN_2_ID" -s "$GAIA_DATA/$CHAIN_2_ID/data" -y --peer-id 08B4625466AE926E7A5BB3D3DFF611E6CD118A88
-fi
-
 # add the key seeds to the keyring of each chain
 echo "Importing keys..."
 cargo run -q --bin hermes -- -c "$CONFIG_FILE" keys add "$CHAIN_0_ID" "$GAIA_DATA/$CHAIN_0_ID/key_seed.json"