diff --git a/scripts/update_schemas.py b/scripts/update_schemas.py
index dd39278..9b4c88f 100755
--- a/scripts/update_schemas.py
+++ b/scripts/update_schemas.py
@@ -9,7 +9,7 @@
 
 import xml.etree.ElementTree as ET
 
-VERSION = "DSP8010_2021.1"
+VERSION = "DSP8010_2021.2"
 
 # To use a new schema, add to list and rerun tool
 include_list = [
@@ -161,9 +161,9 @@
         " Version=\"4.0\">\n")
 
     for zip_filepath in zip_ref.namelist():
-        if zip_filepath.startswith(VERSION + '/csdl/') and \
+        if zip_filepath.startswith(VERSION + '/' + VERSION + '/csdl/') and \
             (zip_filepath != VERSION + "/csdl/") and \
-                (zip_filepath != VERSION + "/csdl/"):
+                (zip_filepath != VERSION + '/' + VERSION + "/csdl/"):
             filename = os.path.basename(zip_filepath)
 
             # filename looks like Zone_v1.xml
@@ -260,7 +260,7 @@
 
 schema_files = {}
 for zip_filepath in zip_ref.namelist():
-    if zip_filepath.startswith(os.path.join(VERSION, 'json-schema/')):
+    if zip_filepath.startswith(os.path.join(VERSION, VERSION, 'json-schema/')):
         filename = os.path.basename(zip_filepath)
         filenamesplit = filename.split(".")
 
@@ -281,7 +281,7 @@
 
 for schema, version in schema_files.items():
     basename = schema + "." + version + ".json"
-    zip_filepath = os.path.join(VERSION, "json-schema", basename)
+    zip_filepath = os.path.join(VERSION, VERSION, "json-schema", basename)
     schemadir = os.path.join(json_schema_path, schema)
     os.makedirs(schemadir)
     location_json = OrderedDict()