diff --git a/.github/workflows/build_trtllm.yaml b/.github/workflows/build_trtllm.yaml
new file mode 100644
index 00000000..2d7fa4f1
--- /dev/null
+++ b/.github/workflows/build_trtllm.yaml
@@ -0,0 +1,46 @@
+name: Build TensorRT-LLM
+
+on:
+  push:
+    branches:
+      - 'main'
+    tags:
+      - 'v*'
+  pull_request:
+    paths:
+      - "backends/**"
+      - "server/**"
+      - "proto/**"
+      - "router/**"
+      - "launcher/**"
+      - "Cargo.lock"
+      - "rust-toolchain.toml"
+    branches:
+      - "main"
+
+jobs:
+  checkout:
+    runs-on:
+      group: aws-highmemory-32-plus-priv
+    steps:
+      - name: Checking out code
+        uses: actions/checkout@v4
+
+  call-setup-aws-s3-cache:
+    needs: checkout
+    uses: ./.github/workflows/s3-cache.yaml@s3-cache  # TODO: Change @s3-cache to @main when merged
+    with:
+      runner-group: aws-highmemory-32-plus-priv
+    secrets: inherit
+
+  build:
+    runs-on:
+      group: aws-highmemory-32-plus-priv
+    needs: call-setup-aws-s3-cache
+    steps:
+      - name: "Setup sccache"
+        run: apt update && apt upgrade -y
+
+
+
+
diff --git a/.github/workflows/s3-cache.yaml b/.github/workflows/s3-cache.yaml
new file mode 100644
index 00000000..f6260a6b
--- /dev/null
+++ b/.github/workflows/s3-cache.yaml
@@ -0,0 +1,30 @@
+name: Setup S3 Cache Storage
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - s3-cache
+
+  workflow_call:
+    inputs:
+      # Identify on which runner this workflow should work
+      runner-group:
+        required: true
+        type: string
+
+
+permissions:
+  contents: read # Required to check out repository.
+  id-token: write # Required to authenticate via OIDC.
+
+jobs:
+  setup-cache:
+    runs-on:
+      group: ${{ inputs.runner-group }}
+    steps:
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-region: us-east-1
+          role-to-assume: ${{ secrets.AWS_ROLE_GITHUB_TGI_TEST }}
\ No newline at end of file
diff --git a/.github/workflows/test-s3-cache.yaml b/.github/workflows/test-s3-cache.yaml
deleted file mode 100644
index d0c67692..00000000
--- a/.github/workflows/test-s3-cache.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: test-s3
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-    - s3-cache
-
-
-permissions:
-
-  contents: read # Required to checkout repository.
-  id-token: write # Required to authenticate via OIDC.
-
-jobs:
-  test:
-    runs-on:
-      group: aws-general-8-plus
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          aws-region: us-east-1
-          role-to-assume: ${{ secrets.AWS_ROLE_GITHUB_TGI_TEST }}
-
-      - name: S3 Write
-        run: |
-          aws s3 cp README.md s3://${{ secrets.AWS_S3_BUCKET_GITHUB_TGI_TEST }}
-
-      - name: S3 Read
-        run: |
-          aws s3 ls s3://${{ secrets.AWS_S3_BUCKET_GITHUB_TGI_TEST }}
-      
-