diff --git a/.github/workflows/aws-preview.yml b/.github/workflows/aws-preview.yml
index 11226e8c7..ddf5dd879 100644
--- a/.github/workflows/aws-preview.yml
+++ b/.github/workflows/aws-preview.yml
@@ -39,6 +39,11 @@ jobs:
         registry: ghcr.io
         username: ${{ github.repository_owner }}
         password: ${{ secrets.GITHUB_TOKEN }}
+    - name: Login to Docker Hub
+      uses: docker/login-action@v3
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
     
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2
@@ -58,7 +63,7 @@ jobs:
       with:
         context: ./backend/
         push: true
-        tags: ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}, ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:latest, ghcr.io/stangirard/quivr:latest
+        tags: ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}, ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:latest, ghcr.io/stangirard/quivr:latest, stangirard/quivr-backend-prebuilt:latest, stangirard/quivr-backend-prebuilt:${{ env.IMAGE_TAG }}
         cache-from: type=gha
         cache-to: type=gha,mode=max
       
diff --git a/docker-compose.yml b/docker-compose.yml
index f5ea85a87..870637e5f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,6 +2,7 @@ version: "3.8"
 
 services:
   frontend:
+    image: quivr-frontend-prebuilt
     pull_policy: never
     build:
       context: frontend
@@ -22,8 +23,8 @@ services:
       
 
   backend-core:
-    image: backend-base
-    pull_policy: never
+    image: stangirard/quivr-backend-prebuilt:latest
+    pull_policy: if_not_present
     env_file:
       - .env
     build:
@@ -64,8 +65,8 @@ services:
         condition: service_healthy
 
   worker:
-    pull_policy: never
-    image: backend-base
+    pull_policy: if_not_present
+    image: stangirard/quivr-backend-prebuilt:latest
     env_file:
       - .env
     build:
@@ -79,8 +80,8 @@ services:
       - db
 
   beat:
-    image: backend-base
-    pull_policy: never
+    image: stangirard/quivr-backend-prebuilt:latest
+    pull_policy: if_not_present
     env_file:
       - .env
     build:
@@ -93,8 +94,8 @@ services:
       - redis
 
   flower:
-    image: backend-base
-    pull_policy: never
+    image: stangirard/quivr-backend-prebuilt:latest
+    pull_policy: if_not_present
     env_file:
       - .env
     build: