diff --git a/10.0/Dockerfile b/10.0/Dockerfile
index 91d6178..9422e53 100644
--- a/10.0/Dockerfile
+++ b/10.0/Dockerfile
@@ -21,10 +21,10 @@ RUN set -x; \
 
 # Install Odoo
 ENV ODOO_VERSION 10.0
-ENV ODOO_RELEASE 20161010
+ENV ODOO_RELEASE 20161007
 RUN set -x; \
         curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
-        && echo 'cea0a08d253b97d289f3b0535b48f5a807b39522 odoo.deb' | sha1sum -c - \
+        && echo '1d7a801c9103167bfe7da0ae4191104992e16924 odoo.deb' | sha1sum -c - \
         && dpkg --force-depends -i odoo.deb \
         && apt-get update \
         && apt-get -y install -f --no-install-recommends \
@@ -32,8 +32,8 @@ RUN set -x; \
 
 # Copy entrypoint script and Odoo configuration file
 COPY ./entrypoint.sh /
-COPY ./openerp-server.conf /etc/odoo/
-RUN chown odoo /etc/odoo/openerp-server.conf
+COPY ./openerp-server.conf /etc/odoo/odoo.conf
+RUN chown odoo /etc/odoo/odoo.conf
 
 # Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons
 RUN mkdir -p /mnt/extra-addons \
@@ -44,7 +44,7 @@ VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
 EXPOSE 8069 8071
 
 # Set the default config file
-ENV OPENERP_SERVER /etc/odoo/openerp-server.conf
+ENV OPENERP_SERVER /etc/odoo/odoo.conf
 
 # Set default user when running the container
 USER odoo
diff --git a/10.0/entrypoint.sh b/10.0/entrypoint.sh
index fbb8f37..c404ac1 100755
--- a/10.0/entrypoint.sh
+++ b/10.0/entrypoint.sh
@@ -12,10 +12,10 @@ export PGHOST PGPORT PGUSER PGPASSWORD
 case "$1" in
 	--)
 		shift
-		exec odoo "$@"
+		exec odoo-bin "$@"
 		;;
 	-*)
-		exec odoo "$@"
+		exec odoo-bin "$@"
 		;;
 	*)
 		exec "$@"