diff --git a/sbin/upgrade_database.py b/sbin/upgrade_database.py
index 2acfe60..1a8993e 100755
--- a/sbin/upgrade_database.py
+++ b/sbin/upgrade_database.py
@@ -61,13 +61,13 @@ os.system(cmd)
 	#cmd = f"psql dougal -c 'DROP schema {schema} CASCADE;'"
 	#print(cmd)
 
-for survey in configuration.surveys():
+for survey in configuration.surveys(include_archived=True):
 	id = survey["id"].lower()
 	name = survey["name"]
 	epsg = survey["epsg"]
 	schema = survey["schema"]
 
-	cmd = f"{create_survey} \"{id}\" \"{name}\" {epsg}"
+	cmd = f"SCHEMA_NAME={schema} {create_survey} \"{id}\" \"{name}\" {epsg}"
 	print(cmd)
 	os.system(cmd)