diff --git a/8.0/Dockerfile b/8.0/Dockerfile
index 1e52a67..fc6f071 100644
--- a/8.0/Dockerfile
+++ b/8.0/Dockerfile
@@ -15,7 +15,7 @@ RUN apt-get update \
         && echo '07d397b32f91722de683e8777df2ddd6c49662c2  wkhtmltox.deb' | sha1sum -c - \
         && dpkg --force-depends -i wkhtmltox.deb \
         && apt-get -y install -f \
-        && rm -f wkhtmltox.deb
+        && rm -rf /var/lib/apt/lists/* wkhtmltox.deb
 
 # Grab gosu for easy step-down from root
 RUN gpg --keyserver pgp.mit.edu --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
@@ -27,11 +27,12 @@ RUN curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/dow
 
 # Install Odoo
 ENV ODOO_VERSION 8.0
-ENV ODOO_RELEASE 20141229
+ENV ODOO_RELEASE 20141231
 RUN curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
         && dpkg --force-depends -i odoo.deb \
+        && apt-get update \
         && apt-get -y install -f --no-install-recommends \
-        && rm -f odoo.deb
+        && rm -rf /var/lib/apt/lists/* odoo.deb
 
 # Retrieve Odoo public key and add Odoo nightly to repo list for further updates
 RUN apt-key adv --keyserver pgp.mit.edu --recv-keys 0xdef2a2198183cbb5 \
diff --git a/8.0/run.sh b/8.0/run.sh
index bf6b405..3226180 100755
--- a/8.0/run.sh
+++ b/8.0/run.sh
@@ -1,15 +1,11 @@
 #!/bin/bash
 
-# set openerp-server.conf
-echo "[options]
-; This is the password that allows database operations:
-; admin_passwd = admin
-db_host = $DB_PORT_5432_TCP_ADDR
-db_port = $DB_PORT_5432_TCP_PORT
-db_user = odoo
-db_password = odoo
-data_dir = /var/lib/odoo
-addons_path = /usr/lib/python2.7/dist-packages/openerp/addons" > /etc/odoo/openerp-server.conf
+# set variables in openerp-server.conf
+sed -i "s/^db_host.*/db_host = $DB_PORT_5432_TCP_ADDR/" /etc/odoo/openerp-server.conf
+sed -i "s/^db_port.*/db_port = $DB_PORT_5432_TCP_PORT/" /etc/odoo/openerp-server.conf
+sed -i "s/^db_user.*/db_user = $DB_ENV_POSTGRES_USER/" /etc/odoo/openerp-server.conf
+sed -i "s/^db_password.*/db_password = $DB_ENV_POSTGRES_PASSWORD/" /etc/odoo/openerp-server.conf
+sed -i "\$adata_dir = /var/lib/odoo" /etc/odoo/openerp-server.conf
 
 # start Odoo
 exec gosu odoo /usr/bin/openerp-server --config /etc/odoo/openerp-server.conf