diff --git a/maas/files/restore.sh b/maas/files/restore.sh
index 3d8e786..121b1b4 100644
--- a/maas/files/restore.sh
+++ b/maas/files/restore.sh
@@ -1,15 +1,9 @@
-{%- from "maas/map.jinja" import region with context}
+{%- from "maas/map.jinja" import region with context %}
 
 {%- set database = region.get("database", {}) %}
 
-{%- if database.host is defined %}
-{%- set pghost = database.get("host", "") %}
-export PGHOST={{ pghost }}
-{%- endif %}
-{%- if database.user is defined %}
-{%- set pguser = database.get("user", "") %}
-export PGUSER={{ pguser }}
-{%- endif %}
+export PGHOST={{ database.get("host", "localhost") }}
+export PGUSER={{ database.get("username", "maas") }}
 export PGPASSFILE=/root/.pgpass
 
 {%- set db_name = database.get("name", "maasdb") %}
@@ -20,8 +14,9 @@
 {%- set backupninja_source = database.initial_data.get("source", "cfg01.local")%}
 {%- set source_name = db_name + ".pg_dump.gz" %}
 {%- set dest_name = db_name + ".pg_dump.gz" %}
-{%- set target = "/root/postgresql/data/" %}
+{%- set target = "/root/postgresql/restore_data/" %}
 
+mkdir -p {{ target }}
 
 scp backupninja@{{ backupninja_host }}:/srv/backupninja/{{ backupninja_source }}/var/backups/postgresql/postgresql.{{ age }}/{{ source_name }} {{ target }}{{ dest_name }} 
 gunzip -d -1 -f {{ target }}{{ dest_name }}
@@ -35,6 +30,7 @@
 
 pg_restore {{ target }}{{ db_name }}.pg_dump --dbname={{ db_name }} --no-password -c
 
+mkdir -p /root/maas/flags
 touch /root/maas/flags/{{ db_name }}-installed
 
 sudo systemctl start maas-dhcpd.service
diff --git a/maas/region.sls b/maas/region.sls
index 8edef35..47ac9d7 100644
--- a/maas/region.sls
+++ b/maas/region.sls
@@ -26,6 +26,7 @@
   file.managed:
     - source: salt://maas/files/restore.sh
     - mode: 770
+    - makedirs: true
     - template: jinja
 
 restore_maas_database_{{ region.database.name }}: