diff --git a/ckan/setup.sh b/ckan/setup.sh
old mode 100644
new mode 100755
diff --git a/lxc-build b/lxc-build
index 714d611..7d98676 100755
--- a/lxc-build
+++ b/lxc-build
@@ -135,3 +135,4 @@ for line in recipe:
         cmd = line.split()[1]
         rebuild_config()
 layers.append('{}/delta0'.format(image))
+rebuild_config()
diff --git a/postgres/setup.sh b/postgres/setup.sh
index 448f6fc..405e399 100755
--- a/postgres/setup.sh
+++ b/postgres/setup.sh
@@ -7,7 +7,7 @@ SOURCE_DIR=$(realpath $(dirname "${0}"))/setup
 mkdir -p /srv/postgres/data
 chown -R 5432:5432 /srv/postgres/data
 chmod 700 /srv/postgres/data
-lxc-execute -n postgres -- postgres initdb -D /var/lib/postgresql
+lxc-execute -n postgres -- sh -lc 'initdb -D /var/lib/postgresql'
 
 # Configure Postgres
 cp ${SOURCE_DIR}/srv/postgres/data/postgresql.conf /srv/postgres/data/postgresql.conf