diff --git a/.github/workflows/_comps-workflow.yml b/.github/workflows/_comps-workflow.yml
index 81813d92d..5426ed41f 100644
--- a/.github/workflows/_comps-workflow.yml
+++ b/.github/workflows/_comps-workflow.yml
@@ -6,9 +6,6 @@ permissions: read-all
 on:
   workflow_call:
     inputs:
-      node:
-        required: true
-        type: string
       service:
         required: true
         type: string
@@ -36,7 +33,7 @@ jobs:
   # Image Build
   ####################################################################################################
   build-images:
-    runs-on: "docker-build-${{ inputs.node }}"
+    runs-on: "docker-build-gaudi"
     continue-on-error: true
     outputs:
       file_exists: ${{ steps.get-yaml-path.outputs.file_exists }}
@@ -84,10 +81,9 @@ jobs:
   ####################################################################################################
   test-service-compose:
     needs: [build-images]
-    if: ${{ fromJSON(inputs.test) && needs.build-images.outputs.file_exists == 'true' }}
+    if: ${{ fromJSON(inputs.test) }}
     uses: ./.github/workflows/_run-docker-compose.yml
     with:
       tag: ${{ inputs.tag }}
       service: ${{ inputs.service }}
-      hardware: ${{ inputs.node }}
     secrets: inherit
diff --git a/.github/workflows/_run-docker-compose.yml b/.github/workflows/_run-docker-compose.yml
index 15e9bae61..5b89f67b2 100644
--- a/.github/workflows/_run-docker-compose.yml
+++ b/.github/workflows/_run-docker-compose.yml
@@ -20,10 +20,6 @@ on:
         description: Example to test
         required: true
         type: string
-      hardware:
-        description: Hardware to run the test on
-        required: true
-        type: string
 jobs:
   get-test-case:
     runs-on: ubuntu-latest
@@ -57,6 +53,7 @@ jobs:
           cd ${{ github.workspace }}/tests
           test_cases=$(find . -type f -name "test_${service_l}*.sh" -print | jq -R '.' | jq -sc '.')
           echo "test_cases=$test_cases" >> $GITHUB_OUTPUT
+          # TODO: get hardware for test matrix
 
   run-test:
     needs: [get-test-case]
@@ -64,7 +61,7 @@ jobs:
       matrix:
         test_case: ${{ fromJSON(needs.get-test-case.outputs.test_cases) }}
       fail-fast: false
-    runs-on: ${{ inputs.hardware }}
+    runs-on: gaudi
     continue-on-error: true
     steps:
       - name: Clean up Working Directory
@@ -88,7 +85,6 @@ jobs:
           GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
           PINECONE_KEY: ${{ secrets.PINECONE_KEY }}
           service: ${{ inputs.service }}
-          hardware: ${{ inputs.hardware }}
           test_case: ${{ matrix.test_case }}
         run: |
           cd ${{ github.workspace }}/tests
diff --git a/.github/workflows/manual-comps-test.yml b/.github/workflows/manual-comps-test.yml
index bde3bf9fa..a56b297de 100644
--- a/.github/workflows/manual-comps-test.yml
+++ b/.github/workflows/manual-comps-test.yml
@@ -56,7 +56,6 @@ jobs:
     with:
       service: ${{ matrix.service }}
       tag: ${{ inputs.tag }}
-      node: gaudi
       mode: ${{ inputs.mode }}
       test: ${{ inputs.test }}
     secrets: inherit