diff --git a/src/travis2docker/templates/Dockerfile_deployv b/src/travis2docker/templates/Dockerfile_deployv
index 326b2b4..8abb1d3 100644
--- a/src/travis2docker/templates/Dockerfile_deployv
+++ b/src/travis2docker/templates/Dockerfile_deployv
@@ -36,6 +36,7 @@ RUN . /home/odoo/build.sh && \
     chown_all && \
     [ -e /entrypoint_image ] && mv /entrypoint_image /deployv_entrypoint_image ; \
     [ -e /entry_point.py ] && mv /entry_point.py /deployv_entry_point.py ; \
+    [ -e /entrypoint ] && mv /entrypoint /deployv_entrypoint ; \
     mkdir -p /run/sshd
 
 {% for step in build_extra_steps %}
diff --git a/src/travis2docker/templates/build.sh b/src/travis2docker/templates/build.sh
index a215270..89ab771 100644
--- a/src/travis2docker/templates/build.sh
+++ b/src/travis2docker/templates/build.sh
@@ -28,8 +28,23 @@ install_pgcli_venv(){
 }
 
 odoo_conf(){
-    export ODOO_CONF=/home/odoo/.openerp_serverrc
-    /entry_point.py run true
+    if [ -f "/home/odoo/.odoorc" ]; then
+        export ODOO_CONF="/home/odoo/.odoorc"
+    elif [ -f "/home/odoo/.openerp_serverrc" ]; then
+        export ODOO_CONF="/home/odoo/.openerp_serverrc"
+    else
+        echo "❌ Odoo configuration file not found."
+        exit 1
+    fi
+    if [ -x "/entrypoint" ]; then
+        export ENTRYPOINT="/entrypoint"
+    elif [ -x "/entry_point.py" ]; then
+        export ENTRYPOINT="/entry_point.py"
+    else
+        echo "❌ Orchest entrypoint not found"
+        exit 1
+    fi
+    $ENTRYPOINT run true
     sed -i '/db_host\|db_password\|db_user\|workers\|list_db/d' $ODOO_CONF
     su odoo -c "mkdir -p $ODOORC_DATA_DIR"
 }