diff --git a/.github/workflows/build_trtllm.yaml b/.github/workflows/build_trtllm.yaml
index aa75977d..c71d1628 100644
--- a/.github/workflows/build_trtllm.yaml
+++ b/.github/workflows/build_trtllm.yaml
@@ -16,7 +16,7 @@ on:
         value: ${{ jobs.build-and-push.outputs.label }}
 
 jobs:
-  build-and-push:
+  build-trtllm-and-push:
     permissions:
       contents: read # Required to check out repository.
       id-token: write # Required to authenticate via OIDC.
@@ -114,7 +114,7 @@ jobs:
           platforms: 'linux/amd64'
           build-args: |
             build_type=dev
-            is_gha_build=true
+            is_gha_build=TRUE
             aws_access_key_id=${{ steps.aws-creds.outputs.aws-access-key-id }}
             aws_secret_access_key=${{ steps.aws-creds.outputs.aws-secret-access-key }}
             aws_session_token=${{ steps.aws-creds.outputs.aws-session-token }}
diff --git a/.github/workflows/trtllm_tests.yaml b/.github/workflows/trtllm_tests.yaml
index 2b818f45..2aff01fa 100644
--- a/.github/workflows/trtllm_tests.yaml
+++ b/.github/workflows/trtllm_tests.yaml
@@ -21,7 +21,7 @@ on:
       - "main"
 
 jobs:
-  build-and-push:
+  build-backend:
     permissions:
       contents: write
       packages: write
diff --git a/Dockerfile_trtllm b/Dockerfile_trtllm
index e6d49401..0b13f2f8 100644
--- a/Dockerfile_trtllm
+++ b/Dockerfile_trtllm
@@ -84,11 +84,13 @@ ENV SCCACHE_BUCKET=$sccache_bucket
 ENV SCCACHE_S3_KEY_PREFIX=$sccache_s3_key_prefix
 ENV SCCACHE_REGION=$sccache_region
 
-ENV CMAKE_PREFIX_PATH="/usr/local/mpi:/usr/local/tensorrt:$CMAKE_PREFIX_PATH"
-ENV CUDA_ARCH_LIST=${cuda_arch_list}
 ENV LD_LIBRARY_PATH="/usr/local/mpi/lib:$LD_LIBRARY_PATH"
 ENV PKG_CONFIG_PATH="/usr/local/mpi/lib/pkgconfig:$PKG_CONFIG_PATH"
+ENV CMAKE_PREFIX_PATH="/usr/local/mpi:/usr/local/tensorrt:$CMAKE_PREFIX_PATH"
+
 ENV USE_LLD_LINKER=ON
+ENV CUDA_ARCH_LIST=${cuda_arch_list}
+ENV CMAKE_CXX_COMPILER_LAUNCHER=sccache
 ENV RUSTC_WRAPPER=sccache
 
 COPY . .