diff --git a/8.0/Dockerfile b/8.0/Dockerfile
index ad3de2f..7a8f302 100644
--- a/8.0/Dockerfile
+++ b/8.0/Dockerfile
@@ -38,8 +38,11 @@ VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
 # Expose Odoo services
 EXPOSE 8069 8071
 
+# Set the default config file
+ENV OPENERP_SERVER /etc/odoo/openerp-server.conf
+
 # Set default user when running the container
 USER odoo
 
 ENTRYPOINT ["/entrypoint.sh"]
-CMD ["/usr/bin/openerp-server", "--config=/etc/odoo/openerp-server.conf"]
+CMD ["openerp-server"]
diff --git a/8.0/entrypoint.sh b/8.0/entrypoint.sh
index f0afda8..bddfc35 100755
--- a/8.0/entrypoint.sh
+++ b/8.0/entrypoint.sh
@@ -10,7 +10,7 @@ set -e
 export PGHOST PGPORT PGUSER PGPASSWORD
 
 if [ "${1:0:1}" = '-' ]; then
-	set -- /usr/bin/openerp-server --config=/etc/odoo/openerp-server.conf "$@"
+	set -- openerp-server "$@"
 fi
 
 exec "$@"