diff --git a/run-nitro-test-node/action.yml b/run-nitro-test-node/action.yml
index 2b0d5a7..273a476 100644
--- a/run-nitro-test-node/action.yml
+++ b/run-nitro-test-node/action.yml
@@ -53,31 +53,36 @@ runs:
         if [ -n "${{ inputs.nitro-contracts-branch }}" ]; then
           export NITRO_CONTRACTS_BRANCH="${{ inputs.nitro-contracts-branch }}"
         fi
+
         if [ -n "${{ inputs.token-bridge-branch }}" ]; then
           export TOKEN_BRIDGE_BRANCH="${{ inputs.token-bridge-branch }}"
         fi
 
-        ./test-node.bash --init ${{ inputs.no-simple == 'true' && '--no-simple' || '' }} \
-          ${{ inputs.l3-node == 'true' && '--l3node' || '' }} \
-          ${{ inputs.no-token-bridge == 'true' && '--no-tokenbridge' || '--tokenbridge' }} \
-          ${{ inputs.l3-node == 'true' && inputs.no-l3-token-bridge != 'true' && '--l3-token-bridge' || '' }} \
-          ${{ inputs.args }} &
+        if [ -n "${{ inputs.args }}" ]; then
+          ./test-node.bash --init ${{ inputs.args }} &
+        else
+          ./test-node.bash --init \
+            ${{ inputs.no-simple == 'true' && '--no-simple' || '' }} \
+            ${{ inputs.l3-node == 'true' && '--l3node' || '' }} \
+            ${{ inputs.no-token-bridge == 'true' && '--no-tokenbridge' || '--tokenbridge' }} \
+            ${{ inputs.l3-node == 'true' && inputs.no-l3-token-bridge != 'true' && '--l3-token-bridge' || '' }} &
+        fi
 
     - name: Wait for nitro startup
       shell: bash
       run: ${{ github.action_path }}/waitForNitro.sh 8547
 
     - name: Wait for L3 startup
-      if: ${{ inputs.l3-node == 'true' }}
+      if: ${{ contains(inputs.args, '--l3node') || inputs.l3-node == 'true' }}
       shell: bash
       run: ${{ github.action_path }}/waitForNitro.sh 3347
 
     - name: Wait for token bridge deployment
-      if: ${{ inputs.no-token-bridge != 'true' }}
+      if: ${{ contains(inputs.args, '--tokenbridge') || inputs.no-token-bridge != 'true' }}
       shell: bash
       run: ${{ github.action_path }}/waitForTokenBridge.sh localNetwork.json
 
     - name: Wait for token bridge deployment
-      if: ${{ inputs.l3-node == 'true' && inputs.no-l3-token-bridge != 'true' }}
+      if: ${{ contains(inputs.args, '--l3-token-bridge') || (inputs.l3-node == 'true' && inputs.no-l3-token-bridge != 'true') }}
       shell: bash
       run: ${{ github.action_path }}/waitForTokenBridge.sh l2l3_network.json