diff --git a/odoo/entrypoint.sh b/odoo/entrypoint.sh
index 33fa16e..ee70608 100755
--- a/odoo/entrypoint.sh
+++ b/odoo/entrypoint.sh
@@ -14,6 +14,23 @@ while IFS='=' read -r key value || [[ -n $key ]]; do
     eval "$key=\"$value\""
 done < .env
 
+
+# Check the USE_REDIS variable to decide whether to copy Redis directories
+if [[ $USE_REDIS == "true" ]]; then
+    LOAD+=",base_attachment_object_storage"
+    LOAD+=",session_redis"
+fi
+
+# Check the USE_S3 variable to decide whether to copy S3 directories
+if [[ $USE_S3 == "true" ]]; then
+    LOAD+=",attachment_s3"
+fi
+
+# Check if the repository directory exists and Sentry is to be used
+if [[ $USE_SENTRY == "true" ]]; then
+    LOAD+=",sentry"
+fi
+
 case "$1" in
     -- | odoo)
         shift
diff --git a/odoo/odoorc.sh b/odoo/odoorc.sh
index dafb911..886f6db 100755
--- a/odoo/odoorc.sh
+++ b/odoo/odoorc.sh
@@ -27,7 +27,8 @@ fi
 
 # Check the USE_S3 variable to decide whether to copy S3 directories
 if [[ $USE_S3 == "true" ]]; then
-    LOAD+=",base_attachment_object_storage,attachment_s3"
+    LOAD+=",base_attachment_object_storage"
+    LOAD+=",attachment_s3"
 fi
 
 # Check if the repository directory exists and Sentry is to be used
@@ -35,8 +36,6 @@ if [[ $USE_SENTRY == "true" ]]; then
     LOAD+=",sentry"
 fi
 
-echo "Loading addons: $LOAD"
-
 # Copy the example conf to the destination to start replacing the variables
 cp "$TEMPLATE_CONF" "$ODOO_RC"
 
diff --git a/odoo/third-party-addons.sh b/odoo/third-party-addons.sh
index c562ec4..d101247 100755
--- a/odoo/third-party-addons.sh
+++ b/odoo/third-party-addons.sh
@@ -2,21 +2,23 @@
 
 set -e
 
-# Always use base_attachment_object_storage
-git clone https://github.com/odoocker/odoo-cloud-platform.git --depth 1 --branch $ODOO_TAG --single-branch --no-tags;
-cp -r odoo-cloud-platform/base_attachment_object_storage $THIRD_PARTY_ADDONS/base_attachment_object_storage
+# Check if the repository directory exists and either Redis or S3 is to be used
+if [[ ${USE_REDIS} == "true" || ${USE_S3} == "true" ]]; then
+    git clone https://github.com/odoocker/odoo-cloud-platform.git --depth 1 --branch ${ODOO_TAG} --single-branch --no-tags;
+fi
 
-if [[ $USE_REDIS == "true" ]]; then
-    cp -r odoo-cloud-platform/session_redis $THIRD_PARTY_ADDONS/session_redis
+if [[ ${USE_REDIS} == "true" ]]; then
+    cp -r odoo-cloud-platform/session_redis ${THIRD_PARTY_ADDONS}/session_redis
 fi
 
 # Check the USE_S3 variable to decide whether to copy S3 directories
-if [[ $USE_S3 == "true" ]]; then
-    cp -r odoo-cloud-platform/attachment_s3 $THIRD_PARTY_ADDONS/attachment_s3
+if [[ ${USE_S3} == "true" ]]; then
+    cp -r odoo-cloud-platform/base_attachment_object_storage ${THIRD_PARTY_ADDONS}/base_attachment_object_storage
+    cp -r odoo-cloud-platform/attachment_s3 ${THIRD_PARTY_ADDONS}/attachment_s3
 fi
 
 # Check if the repository directory exists and Sentry is to be used
-if [[ $USE_SENTRY == "true" ]]; then
-    git clone https://github.com/odoocker/server-tools.git --depth 1 --branch $ODOO_TAG --single-branch --no-tags;
-    cp -r server-tools/sentry $THIRD_PARTY_ADDONS/sentry
+if [[ ${USE_SENTRY} == "true" ]]; then
+    git clone https://github.com/odoocker/server-tools.git --depth 1 --branch ${ODOO_TAG} --single-branch --no-tags;
+    cp -r server-tools/sentry ${THIRD_PARTY_ADDONS}/sentry
 fi