diff --git a/postgres-backup-s3/backup.sh b/postgres-backup-s3/backup.sh
index 5510c01..a24a15f 100644
--- a/postgres-backup-s3/backup.sh
+++ b/postgres-backup-s3/backup.sh
@@ -58,8 +58,13 @@ export PGPASSWORD=$POSTGRES_PASSWORD
 POSTGRES_HOST_OPTS="-h $POSTGRES_HOST -p $POSTGRES_PORT -U $POSTGRES_USER $POSTGRES_EXTRA_OPTS"
 
 echo "Creating dump of ${POSTGRES_DATABASE} database from ${POSTGRES_HOST}..."
-
-pg_dump $POSTGRES_HOST_OPTS $POSTGRES_DATABASE | gzip > dump.sql.gz
+if ["${DUMPALL}" = "true" ]; then
+    echo "Creating dump of whole pg cluster from ${POSTGRES_HOST}..."
+    pg_dumpall $POSTGRES_HOST_OPTS | gzip > dump.sql.gz
+else
+    echo "Creating dump of ${POSTGRES_DATABASE} database from ${POSTGRES_HOST}..."
+    pg_dump $POSTGRES_HOST_OPTS $POSTGRES_DATABASE | gzip > dump.sql.gz
+fi
 
 echo "Uploading dump to $S3_BUCKET"
 
diff --git a/postgres-restore-s3/restore.sh b/postgres-restore-s3/restore.sh
index 495c237..74e0eec 100644
--- a/postgres-restore-s3/restore.sh
+++ b/postgres-restore-s3/restore.sh
@@ -67,7 +67,7 @@ fi
 
 echo "Restoring ${LATEST_BACKUP}"
 
-psql $POSTGRES_HOST_OPTS -d $POSTGRES_DATABASE < dump.sql
+psql $POSTGRES_HOST_OPTS < dump.sql
 
 echo "Restore complete"