diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml
index 16fcdf02..b7f86478 100644
--- a/.github/workflows/copilot-setup-steps.yml
+++ b/.github/workflows/copilot-setup-steps.yml
@@ -28,6 +28,11 @@ jobs:
         env:
           NUGET_AUTH_TOKEN: ${{ secrets.AZURE_DEVOPS_PAT }}
 
+      - name: Set up Node.js for frontend development
+        uses: actions/setup-node@v6
+        with:
+          node-version: '24'
+
       - name: Set up dependency caching for faster builds
         uses: actions/cache@v5
         id: nuget-cache
@@ -40,6 +45,19 @@ jobs:
             ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
             ${{ runner.os }}-nuget-
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4
+
+      - name: Install additional development tools
+        shell: bash
+        run: |
+          echo "Installing additional tools for Copilot agent environment..."
+          if dotnet tool list --global | grep -q 'dotnet-ef'; then
+            dotnet tool update --global dotnet-ef
+          else
+            dotnet tool install --global dotnet-ef
+          fi
+
       - name: Restore with dotnet
         run: dotnet restore
 
@@ -48,19 +66,3 @@ jobs:
 
       - name: Run .NET Tests
         run: dotnet test --no-build --configuration Release
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
-
-      - name: Set up Node.js for frontend development
-        uses: actions/setup-node@v6
-        with:
-          node-version: '24'
-
-      - name: Install additional development tools
-        run: |
-          # Install common development tools that Copilot agents might need
-          echo "Installing additional tools for Copilot agent environment..."
-          
-          # Install EF Core tools globally
-          dotnet tool install --global dotnet-ef