diff --git a/clevercloud/python.json b/clevercloud/python.json
index 1d640ae99..28a8e7dbf 100644
--- a/clevercloud/python.json
+++ b/clevercloud/python.json
@@ -7,8 +7,7 @@
         "managetasks": [
             "migrate --no-input",
             "collectstatic --no-input",
-            "compress --force",
-            "rebuild_index --noinput"
+            "compress --force"
         ]
     }
 }
diff --git a/config/settings/base.py b/config/settings/base.py
index 874368521..0b114c6af 100644
--- a/config/settings/base.py
+++ b/config/settings/base.py
@@ -260,10 +260,17 @@
 HAYSTACK_CONNECTIONS = {
     "default": {
         "ENGINE": "haystack.backends.whoosh_backend.WhooshEngine",
-        "PATH": f"{AWS_S3_ENDPOINT_URL}/whoosh_index",
+        "PATH": f"s3://{AWS_STORAGE_BUCKET_NAME}/whoosh_index",
+        "AWS_ACCESS_KEY_ID": AWS_S3_ACCESS_KEY_ID,
+        "AWS_SECRET_ACCESS_KEY": AWS_S3_SECRET_ACCESS_KEY,
+        "AWS_STORAGE_BUCKET_NAME": AWS_STORAGE_BUCKET_NAME,
+        "AWS_S3_ENDPOINT_URL": AWS_S3_ENDPOINT_URL,
+        "AWS_S3_REGION_NAME": AWS_S3_STORAGE_BUCKET_REGION,
+        "AWS_S3_USE_SSL": True,  # Change to True if your endpoint supports SSL
+        "AWS_AUTO_CREATE_BUCKET": False,  # Set to True if you want Haystack to create the bucket
+        "AWS_AUTO_CREATE_INDEX": True,  # Set to False if you manually create the index
     },
 }
-
 # Forum - Machina settings
 # ------------------------------------------------------------------------------
 MACHINA_FORUM_NAME = "La Communauté"