diff --git a/9.0/20160512/Dockerfile b/9.0/20160512/Dockerfile
new file mode 100644
index 0000000..8205e16
--- /dev/null
+++ b/9.0/20160512/Dockerfile
@@ -0,0 +1,29 @@
+FROM steenzout/odoo:9.0-base
+MAINTAINER Pedro Salgado "steenzout@ymail.com"
+
+ENV ODOO_RELEASE 20160512
+ENV ODOO_SHA1SUM b25f026723fb67e333496f8741821f60795d3372
+
+# Set the default config file
+ENV OPENERP_SERVER /etc/odoo/openerp-server.conf
+
+# Install Odoo
+RUN set -x;         curl -o odoo.deb -SL http://nightly.odoo.com/9.0/nightly/deb/odoo_9.0c.20160512_all.deb         && echo "b25f026723fb67e333496f8741821f60795d3372 odoo.deb" | sha1sum -c -         && dpkg --force-depends -i odoo.deb         && apt-get update         && apt-get -y install -f --no-install-recommends         && rm -rf /var/lib/apt/lists/* odoo.deb
+
+# Copy entrypoint script and Odoo configuration file
+COPY "9.0/entrypoint.sh" /
+COPY "9.0/openerp-server.conf" /etc/odoo/
+RUN chown odoo /etc/odoo/openerp-server.conf
+
+# Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons
+RUN mkdir -p /mnt/extra-addons         && chown -R odoo /mnt/extra-addons
+VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
+
+# Expose Odoo services
+EXPOSE 8069 8071
+
+# Set default user when running the container
+USER odoo
+
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["openerp-server"]