diff --git a/.github/workflows/dotnet-eks-e2e-test.yml b/.github/workflows/dotnet-eks-e2e-test.yml
index 1a5157be4..d9bcf9f68 100644
--- a/.github/workflows/dotnet-eks-e2e-test.yml
+++ b/.github/workflows/dotnet-eks-e2e-test.yml
@@ -314,40 +314,27 @@ jobs:
           echo "CW Agent Operator Image: Previous Version is: ${{ steps.patch-image.outputs.default-cw-agent-operator-image }}, Updated Version is: ${{ steps.patch-image.outputs.latest-cw-agent-operator-image }}";
           echo "Fluent Bit Image: Version is: ${{ steps.patch-image.outputs.fluent-bit-image }}";
 
-      - name: Get Remote Service Deployment Name
-        uses: ./.github/workflows/actions/execute_and_retry
-        with:
-          command: echo "REMOTE_SERVICE_DEPLOYMENT_NAME=$(kubectl get deployments -n ${{ env.DOTNET_SAMPLE_APP_NAMESPACE }} --selector=app=remote-app -o jsonpath='{.items[0].metadata.name}')" >> $GITHUB_ENV
-          max_retry: 3
-          sleep_time: 30
-
-      - name: Get Remote Service IP
-        uses: ./.github/workflows/actions/execute_and_retry
-        with:
-          command: echo "REMOTE_SERVICE_POD_IP=$(kubectl get pods -n ${{ env.DOTNET_SAMPLE_APP_NAMESPACE }} --selector=app=remote-app -o jsonpath='{.items[0].status.podIP}')" >> $GITHUB_ENV
-          max_retry: 3
-          sleep_time: 30
+      - name: Get remote service pod name and IP
+        run: |
+          echo "REMOTE_SERVICE_DEPLOYMENT_NAME=$(kubectl get deployments -n ${{ env.DOTNET_SAMPLE_APP_NAMESPACE }} --selector=app=remote-app -o jsonpath='{.items[0].metadata.name}')" >> $GITHUB_ENV
+          echo "REMOTE_SERVICE_POD_IP=$(kubectl get pods -n ${{ env.DOTNET_SAMPLE_APP_NAMESPACE }} --selector=app=remote-app -o jsonpath='{.items[0].status.podIP}')" >> $GITHUB_ENV
 
-      - name: Get Remote Service IP
-        uses: ./.github/workflows/actions/execute_and_retry
-        with:
-          command: echo "APP_ENDPOINT=$(kubectl get pods -n ${{ env.DOTNET_SAMPLE_APP_NAMESPACE }} --selector=app=sample-app -o jsonpath='{.items[0].status.podIP}'):8080" >> $GITHUB_ENV
-          max_retry: 3
-          sleep_time: 30
+      - name: Get the sample app endpoint
+        run: echo "APP_ENDPOINT=$(kubectl get pods -n ${{ env.DOTNET_SAMPLE_APP_NAMESPACE }} --selector=app=dotnet-app -o jsonpath='{.items[0].status.podIP}'):8080" >> $GITHUB_ENV
+        working-directory: terraform/dotnet/eks
 
       - name: Set endpoints for the traffic generator
-        uses: ./.github/workflows/actions/execute_and_retry
-        with:
-          command: kubectl set env -n ${{ env.DOTNET_SAMPLE_APP_NAMESPACE }} deployment/traffic-generator MAIN_ENDPOINT=${{ env.APP_ENDPOINT }} REMOTE_ENDPOINT=${{ env.REMOTE_SERVICE_POD_IP }}
-          max_retry: 3
-          sleep_time: 30
+        run: |
+          # Add the appropriate environment variables to the traffic generator
+          kubectl set env -n ${{ env.DOTNET_SAMPLE_APP_NAMESPACE }} deployment/traffic-generator MAIN_ENDPOINT=${{ env.APP_ENDPOINT }}
+          kubectl set env -n ${{ env.DOTNET_SAMPLE_APP_NAMESPACE }} deployment/traffic-generator REMOTE_ENDPOINT=${{ env.REMOTE_SERVICE_POD_IP }}
 
       - name: Initiate Gradlew Daemon
         if: steps.initiate-gradlew == 'failure'
         uses: ./.github/workflows/actions/execute_and_retry
         continue-on-error: true
         with:
-          command: "./gradlew :validator:build"
+          command: "./gradlew"
           cleanup: "./gradlew clean"
           max_retry: 3
           sleep_time: 60