diff --git a/maas/files/restore.sh b/maas/files/restore.sh
index 255cec5..a43a5ed 100644
--- a/maas/files/restore.sh
+++ b/maas/files/restore.sh
@@ -19,17 +19,17 @@
 
 mkdir -p {{ target }}
 
-scp backupninja@{{ backupninja_host }}:{{ backup_dir }}/{{ backupninja_source }}/var/backups/postgresql/postgresql.{{ age }}/{{ source_name }} {{ target }}{{ dest_name }} 
-gunzip -d -1 -f {{ target }}{{ dest_name }}
+scp backupninja@{{ backupninja_host }}:{{ backup_dir }}/{{ backupninja_source }}/var/backups/postgresql/postgresql.{{ age }}/{{ source_name }} {{ target }}/{{ dest_name }}
+gunzip -d -1 -f {{ target }}/{{ dest_name }}
 
-scp -r backupninja@{{ backupninja_host }}:{{ backup_dir }}/{{ backupninja_source }}/etc/maas/maas.{{ age }} /etc/maas
-scp -r backupninja@{{ backupninja_host }}:{{ backup_dir }}/{{ backupninja_source }}/var/lib/maas/maas.{{ age }} /var/lib/maas
+scp -r backupninja@{{ backupninja_host }}:{{ backup_dir }}/{{ backupninja_source }}/etc/maas/maas.{{ age }}/* /etc/maas/
+scp -r backupninja@{{ backupninja_host }}:{{ backup_dir }}/{{ backupninja_source }}/var/lib/maas/maas.{{ age }}/* /var/lib/maas/
 
 sudo systemctl stop maas-dhcpd.service
 sudo systemctl stop maas-rackd.service
 sudo systemctl stop maas-regiond.service
 
-pg_restore {{ target }}{{ db_name }}.pg_dump --dbname={{ db_name }} --no-password -c
+pg_restore {{ target }}/{{ db_name }}.pg_dump --dbname={{ db_name }} --no-password -c
 
 # Restore file permissions
 if [ "$(which setfacl)" != "" ] && [ -e /var/lib/maas/file_permissions.txt ]; then