diff --git a/2.9/scripts/docker-entrypoint.sh b/2.9/scripts/docker-entrypoint.sh
index 102cd18..a5d06fc 100755
--- a/2.9/scripts/docker-entrypoint.sh
+++ b/2.9/scripts/docker-entrypoint.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+API_CONF_FILE="${API_CONF_FILE}"
 SRV_CONF_FILE="/etc/httpd/conf.d/z-ocsinventory-server.conf"
 REPORTS_CONF_FILE="/etc/httpd/conf.d/ocsinventory-reports.conf"
 DB_CONFIG_INC_FILE="${OCS_WEBCONSOLE_DIR}/ocsreports/dbconfig.inc.php"
@@ -28,7 +29,16 @@ if [ ! -f $OCS_WEBCONSOLE_DIR/ocsreports/var.php ]; then
 fi;
 
 cp -r /tmp/OCSNG_UNIX_SERVER-2.9/Api/ /usr/local/share/perl5
-    
+
+if [ ! -z ${OCS_DISABLE_API_MODE+x} ]; then
+	echo
+	echo "+---------------------------------------------------------------------------+"
+	echo "| Warning: OCS_DISABLE_API_MODE environment variable is set!                |"
+	echo "| REST API will be DISABLED                                                 |"
+	echo "+---------------------------------------------------------------------------+"
+	echo
+fi 
+
 if [ ! -z ${OCS_DISABLE_COM_MODE+x} ]; then
 	echo
 	echo "+---------------------------------------------------------------------------+"
@@ -71,16 +81,16 @@ if [ ! -f ${SRV_CONF_FILE} ] && [ -z ${OCS_DISABLE_COM_MODE+x} ]; then
 fi
 
 # Configure zz-ocsinventory-restapi file
-if [ ! -f /etc/httpd/conf.d/zz-ocsinventory-restapi.conf ]; then
-    cp /tmp/conf/ocsinventory-restapi.conf /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
-       sed -i 's/DATABASE_SERVER/'"$OCS_DB_SERVER"'/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
-       sed -i 's/DATABASE_PORT/'"$OCS_DB_PORT"'/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
-       sed -i 's/DATABASE_NAME/'"$OCS_DB_NAME"'/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
-       sed -i 's/DATABASE_USER/'"$OCS_DB_USER"'/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
-       sed -i 's/DATABASE_PASSWD/'"$OCS_DB_PASS"'/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
-       sed -i 's/OCS_SSL_ENABLED/'"$OCS_SSL_ENABLED"'/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
-       sed -i 's/REST_API_PATH/\/usr\/local\/share\/perl5/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
-       sed -i 's/REST_API_LOADER_PATH/\/usr\/local\/share\/perl5\/Api\/Ocsinventory\/Restapi\/Loader.pm/g' /etc/httpd/conf.d/zz-ocsinventory-restapi.conf
+if [ ! -f ${API_CONF_FILE} && [ -z ${OCS_DISABLE_API_MODE+x} ]; then
+    cp /tmp/conf/ocsinventory-restapi.conf ${API_CONF_FILE}
+       sed -i 's/DATABASE_SERVER/'"$OCS_DB_SERVER"'/g' ${API_CONF_FILE}
+       sed -i 's/DATABASE_PORT/'"$OCS_DB_PORT"'/g' ${API_CONF_FILE}
+       sed -i 's/DATABASE_NAME/'"$OCS_DB_NAME"'/g' ${API_CONF_FILE}
+       sed -i 's/DATABASE_USER/'"$OCS_DB_USER"'/g' ${API_CONF_FILE}
+       sed -i 's/DATABASE_PASSWD/'"$OCS_DB_PASS"'/g' ${API_CONF_FILE}
+       sed -i 's/OCS_SSL_ENABLED/'"$OCS_SSL_ENABLED"'/g' ${API_CONF_FILE}
+       sed -i 's/REST_API_PATH/\/usr\/local\/share\/perl5/g' ${API_CONF_FILE}
+       sed -i 's/REST_API_LOADER_PATH/\/usr\/local\/share\/perl5\/Api\/Ocsinventory\/Restapi\/Loader.pm/g' ${API_CONF_FILE}
 fi
 
 # Replace Variables