diff --git a/.github/workflows/template_test.yml b/.github/workflows/template_test.yml
index 1ffb473..bcf9f33 100644
--- a/.github/workflows/template_test.yml
+++ b/.github/workflows/template_test.yml
@@ -71,11 +71,14 @@ jobs:
           sudo rm -rf "/usr/local/share/boost"
           sudo rm -rf "$AGENT_TOOLSDIRECTORY"
 
-      - name: Define Image Repo tags
+      - name: Define Image Repo and other tags
         # Define tags consistently using inputs
         id: tags
         run: |
           echo "image_repo_path=${{ inputs.image_repo }}" >> $GITHUB_OUTPUT
+          echo "TEST_DIRS_TAG=${{ inputs.tests }}" >> $GITHUB_OUTPUT
+          echo "TEST_ENVS_TAG=${{ inputs.testEnvs }}" >> $GITHUB_OUTPUT
+          
 
       - name: Create Docker-Compose File from Inputs
         id: create_compose
@@ -152,8 +155,8 @@ jobs:
       - name: Run Tests
         shell: bash
         run: |
-          TEST_DIRS='${{ inputs.tests }}' # Get JSON array string
-          TEST_ENVS_JSON='${{ inputs.testEnvs }}' # Get JSON array string
+          TEST_DIRS="${{ steps.tags.outputs.TEST_DIRS_TAG }}" # Get JSON array string
+          TEST_ENVS_JSON="${{ steps.tags.outputs.TEST_ENVS_TAG }}" # Get JSON array string
           RESULTS_PATH="${{ inputs.testResultsPath }}"
           STAGING_DIR="${{ runner.temp }}/test-results" # Use runner temp dir for results
           mkdir -p "$STAGING_DIR"
@@ -175,7 +178,7 @@ jobs:
           echo "Using Network: $COMPOSE_NETWORK_NAME"
 
           # Loop through test directories and execute tests
-          echo "$TEST_DIRS" | jq -r '.[]' | while read test_dir; do
+          echo "$TEST_DIRS" | jq -c '.[]' | while read test_dir; do
             test_dir=$(echo $test_dir | sed 's/"//g') # Remove quotes
             echo "Running test: $test_dir"
             docker run \