diff --git a/.github/workflows/container-build.yaml b/.github/workflows/container-build.yaml
index e76643ec9..a78fb6d89 100644
--- a/.github/workflows/container-build.yaml
+++ b/.github/workflows/container-build.yaml
@@ -5,6 +5,8 @@ name: Container Build
 permissions: read-all
 on:
   workflow_dispatch:
+  schedule:
+    - cron: "35 1 * * 6"
 jobs:
   # https://github.com/intel/ai-containers/blob/main/.github/action.yml
   build-containers:
@@ -30,7 +32,7 @@ jobs:
           password: ${{ secrets.REGISTRY_TOKEN }}
       - name: Build Containers
         run: |
-          docker compose -p ${GITHUB_RUN_NUMBER} up --build --no-start
+          docker compose -p ${GITHUB_RUN_NUMBER} build --no-cache
         working-directory: .github/workflows/docker
       - name: Print Containers to Summary
         run: |
@@ -45,4 +47,4 @@ jobs:
         working-directory: .github/workflows/docker
       - name: Remove Containers
         if: always()
-        run: docker system prune --force
+        run: docker system prune --all --force
diff --git a/.github/workflows/docker/docker-compose.yaml b/.github/workflows/docker/docker-compose.yaml
index 019395e05..0e953df87 100644
--- a/.github/workflows/docker/docker-compose.yaml
+++ b/.github/workflows/docker/docker-compose.yaml
@@ -10,31 +10,31 @@ services:
         no_proxy: ${no_proxy}
       context: ../../..
       dockerfile: comps/embeddings/langchain/docker/Dockerfile
-    image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-embedding-tei-server
+    image: ${REGISTRY}/${REPO}:embedding-tei-server
     pull_policy: always
   retriever-redis-server:
     build:
       dockerfile: comps/retrievers/langchain/docker/Dockerfile
     extends: embedding-tei-server
-    image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-retriever-redis-server
+    image: ${REGISTRY}/${REPO}:retriever-redis-server
   reranking-tei-server:
     build:
       dockerfile: comps/reranks/langchain/docker/Dockerfile
     extends: embedding-tei-server
-    image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-reranking-tei-server
+    image: ${REGISTRY}/${REPO}:reranking-tei-server
   llm-tgi-server:
     build:
       dockerfile: comps/llms/langchain/docker/Dockerfile
     extends: embedding-tei-server
-    image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-llm-tgi-server
+    image: ${REGISTRY}/${REPO}:llm-tgi-server
   dataprep-redis-server:
     build:
       dockerfile: comps/dataprep/redis/docker/Dockerfile
     extends: embedding-tei-server
-    image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-dataprep-redis-server
+    image: ${REGISTRY}/${REPO}:dataprep-redis-server
   tei-gaudi:
     build:
       context: ../../../tei-gaudi
       dockerfile: Dockerfile-hpu
     extends: embedding-tei-server
-    image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-tei-gaudi
+    image: ${REGISTRY}/${REPO}:tei-gaudi