diff --git a/.github/workflows/dashboard-test-suite.yaml b/.github/workflows/dashboard-test-suite.yaml
index 8830d97..5b180d5 100644
--- a/.github/workflows/dashboard-test-suite.yaml
+++ b/.github/workflows/dashboard-test-suite.yaml
@@ -66,10 +66,6 @@ on:
         description: "Frontegg Bot Creds"
         required: true
 
-env:
-  BUCKET_NAME: "frontegg-test-reports"
-  AWS_REGION: "us-east-1"
-
 permissions:
   id-token: write
   contents: read
@@ -141,12 +137,13 @@ jobs:
           app_id: ${{ secrets.GH_FRONTEGG_BOT_APP_ID }}
           private_key: ${{ secrets.GH_FRONTEGG_BOT_APP_SECRET }}
 
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          role-to-assume: arn:aws:iam::527305576865:role/github-action-s3-role
-          role-session-name: github-action-session
-          aws-region: ${{ env.AWS_REGION }}
+      - name : Configure Datadog Test Optimization
+        uses : datadog/test-visibility-github-action@v2
+        with :
+          languages : js
+          api_key : ${{secrets.DD_API_KEY}}
+          site : datadoghq.com
+          tags: "triggering_repo:${{ github.repository }}, environment:venv"
           
       - name: Run API Tests from E2E-system-tests repo
         uses: ./.github/actions/api-tests
@@ -165,6 +162,7 @@ jobs:
           AZURE_APP_SECRET: ${{ secrets.AZURE_APP_SECRET }}
           test_script: "yarn run test:e2e:regression:portal:hosted"
           # test_script: yarn run test:e2e:regression:portal:hosted  --shard=${{ matrix.shard }}/${{ matrix.total }}
+          NODE_OPTIONS: '-r ${{env.DD_TRACE_PACKAGE}}'
 
   update-trigger-status:
     name: Update trigger status
diff --git a/.github/workflows/full-test-suite.yaml b/.github/workflows/full-test-suite.yaml
index 9724bf6..c29cdb1 100644
--- a/.github/workflows/full-test-suite.yaml
+++ b/.github/workflows/full-test-suite.yaml
@@ -68,9 +68,6 @@ on:
       DD_API_KEY:
         description: 'Datadog API Key'
         required: true
-env:
-  BUCKET_NAME: "frontegg-test-reports"
-  AWS_REGION: "us-east-1"
 
 permissions:
   id-token: write
diff --git a/.github/workflows/sdk-test-suite.yaml b/.github/workflows/sdk-test-suite.yaml
index f395e25..1accb44 100644
--- a/.github/workflows/sdk-test-suite.yaml
+++ b/.github/workflows/sdk-test-suite.yaml
@@ -69,10 +69,6 @@ on:
         description: 'Frontegg Bot Creds'
         required: true
 
-env:
-  BUCKET_NAME: "frontegg-test-reports"
-  AWS_REGION: "us-east-1"
-
 permissions:
   id-token: write
   contents: read
@@ -126,12 +122,15 @@ jobs:
         with:
           app_id: ${{ secrets.GH_FRONTEGG_BOT_APP_ID }}
           private_key: ${{ secrets.GH_FRONTEGG_BOT_APP_SECRET }}
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          role-to-assume: arn:aws:iam::527305576865:role/github-action-s3-role
-          role-session-name: github-action-session
-          aws-region: ${{ env.AWS_REGION }}
+
+      - name : Configure Datadog Test Optimization
+        uses : datadog/test-visibility-github-action@v2
+        with :
+          languages : js
+          api_key : ${{secrets.DD_API_KEY}}
+          site : datadoghq.com
+          tags: "triggering_repo:${{ github.repository }}, environment:staging"
+          
       - name: Run E2E Tests from E2E-system-tests repo
         uses: ./.github/actions/e2e-test
         with:
@@ -166,6 +165,7 @@ jobs:
           environment: "staging"
           frontegg_client_id: ${{ secrets.FRONTEGG_STG_CLIENT_ID }}
           frontegg_secret: ${{ secrets.FRONTEGG_STG_SECRET }}
+          NODE_OPTIONS: '-r ${{env.DD_TRACE_PACKAGE}}'
 
   run-e2e-test-nextjs:
     name: "Run E2E tests ${{ inputs.client_framework }}@${{ inputs.client_framework_version || inputs.react_version }}"
@@ -189,12 +189,15 @@ jobs:
         with:
           app_id: ${{ secrets.GH_FRONTEGG_BOT_APP_ID }}
           private_key: ${{ secrets.GH_FRONTEGG_BOT_APP_SECRET }}
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          role-to-assume: arn:aws:iam::527305576865:role/github-action-s3-role
-          role-session-name: github-action-session
-          aws-region: ${{ env.AWS_REGION }}
+      
+      - name : Configure Datadog Test Optimization
+        uses : datadog/test-visibility-github-action@v2
+        with :
+          languages : js
+          api_key : ${{secrets.DD_API_KEY}}
+          site : datadoghq.com
+          tags: "triggering_repo:${{ github.repository }}, environment:staging"
+        
       - name: Run E2E Tests from E2E-system-tests repo
         uses: ./.github/actions/e2e-test
         with:
@@ -230,6 +233,8 @@ jobs:
           frontegg_client_id: ${{ secrets.FRONTEGG_STG_CLIENT_ID }}
           frontegg_secret: ${{ secrets.FRONTEGG_STG_SECRET }}
           nextjs_router: ${{ matrix.nextjs_router }}
+          NODE_OPTIONS: '-r ${{env.DD_TRACE_PACKAGE}}'
+
 
   run-admin-box-test:
     name: "Run Admin Box tests ${{ inputs.client_framework || 'react' }}@${{ inputs.client_framework_version || inputs.react_version }}"
@@ -249,12 +254,15 @@ jobs:
         with:
           app_id: ${{ secrets.GH_FRONTEGG_BOT_APP_ID }}
           private_key: ${{ secrets.GH_FRONTEGG_BOT_APP_SECRET }}
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          role-to-assume: arn:aws:iam::527305576865:role/github-action-s3-role
-          role-session-name: github-action-session
-          aws-region: ${{ env.AWS_REGION }}
+    
+      - name : Configure Datadog Test Optimization
+        uses : datadog/test-visibility-github-action@v2
+        with :
+          languages : js
+          api_key : ${{secrets.DD_API_KEY}}
+          site : datadoghq.com
+          tags: "triggering_repo:${{ github.repository }}, environment:staging"
+        
       - name: Run Admin Box Tests from E2E-system-tests repo
         uses: ./.github/actions/admin-box
         with:
@@ -289,6 +297,8 @@ jobs:
           environment: "staging"
           frontegg_client_id: ${{ secrets.FRONTEGG_STG_CLIENT_ID }}
           frontegg_secret: ${{ secrets.FRONTEGG_STG_SECRET }}
+          NODE_OPTIONS: '-r ${{env.DD_TRACE_PACKAGE}}'
+
 
   run-logins-test:
     name: "Run Login Box tests ${{ inputs.client_framework || 'react' }}@${{ inputs.client_framework_version || inputs.react_version }}"
@@ -308,12 +318,15 @@ jobs:
         with:
           app_id: ${{ secrets.GH_FRONTEGG_BOT_APP_ID }}
           private_key: ${{ secrets.GH_FRONTEGG_BOT_APP_SECRET }}
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          role-to-assume: arn:aws:iam::527305576865:role/github-action-s3-role
-          role-session-name: github-action-session
-          aws-region: ${{ env.AWS_REGION }}
+
+      - name : Configure Datadog Test Optimization
+        uses : datadog/test-visibility-github-action@v2
+        with :
+          languages : js
+          api_key : ${{secrets.DD_API_KEY}}
+          site : datadoghq.com
+          tags: "triggering_repo:${{ github.repository }}, environment:staging"
+        
       - name: Run Login Box Tests from E2E-system-tests repo
         uses: ./.github/actions/login-box
         with:
@@ -348,6 +361,8 @@ jobs:
           environment: "staging"
           frontegg_client_id: ${{ secrets.FRONTEGG_STG_CLIENT_ID }}
           frontegg_secret: ${{ secrets.FRONTEGG_STG_SECRET }}
+          NODE_OPTIONS: '-r ${{env.DD_TRACE_PACKAGE}}'
+
 
   update-trigger-status:
     name: Update trigger status