diff --git a/mosip_master/data_upgrade/1.1.5.5_to_1.2.0.1/data-uploader.py b/mosip_master/data_upgrade/1.1.5.5_to_1.2.0.1/data-uploader.py
index 8f2ec576..6b3074fb 100644
--- a/mosip_master/data_upgrade/1.1.5.5_to_1.2.0.1/data-uploader.py
+++ b/mosip_master/data_upgrade/1.1.5.5_to_1.2.0.1/data-uploader.py
@@ -12,6 +12,7 @@
 import sys
 import time
 import psycopg2
+from psycopg2 import sql
 import openpyxl
 
 parser = argparse.ArgumentParser(description='This is CSV/xlsx file uploader script.invokes 1.2.0.1 bulk upload endpoints')
@@ -47,17 +48,18 @@ def getCurrentDateTime():
 def get_seed_value():
   conn = psycopg2.connect(database="mosip_master", user = args.dbusername, password = args.dbpassword, host = args.dbhost, port = args.dbport)
   cursor = conn.cursor()
-  cursor.execute("select id from master."+args.table+" order by id desc limit 20")
+  cursor.execute(sql.SQL("select id from master.{} order by id desc limit 20").format(sql.Identifier(args.table)))
+  seed_value = None
   for row in cursor.fetchall():
     id_value = row[0]
     if id_value is None:
       seed_value = 1000
       break
-    if id_value.isdigit():
+    if str(id_value).isdigit():
       seed_value = id_value
-      break;
-    
-  if seed_value == None:
+      break
+
+  if seed_value is None:
     seed_value = 1000
   return seed_value
 
diff --git a/mosip_master/data_upgrade/1.1.5.5_to_1.2.0.1/migration-ui_spec.py b/mosip_master/data_upgrade/1.1.5.5_to_1.2.0.1/migration-ui_spec.py
index 45697832..ead4b3a3 100644
--- a/mosip_master/data_upgrade/1.1.5.5_to_1.2.0.1/migration-ui_spec.py
+++ b/mosip_master/data_upgrade/1.1.5.5_to_1.2.0.1/migration-ui_spec.py
@@ -49,9 +49,9 @@
 def getSupportedAgeGroups():
 	agegroup_config_json=json.loads(agegroup_config)
 	for ageGroup in agegroup_config_json.keys():
-		modalities = []
-		while not modalities:
-			modalities = agegroup_config_json.get(ageGroup).get("bioAttributes")
+		modalities = agegroup_config_json.get(ageGroup).get("bioAttributes")
+		if modalities is None:
+			modalities = []
 		ageGroupBasedModalities[ageGroup] = modalities
 
 		requiresGuardianAuth = agegroup_config_json.get(ageGroup).get("isGuardianAuthRequired")
diff --git a/mosip_master/data_upgrade/1.1.5.5_to_1.2.0.1/upgrade.sh b/mosip_master/data_upgrade/1.1.5.5_to_1.2.0.1/upgrade.sh
index 2277ea46..b1d8306f 100755
--- a/mosip_master/data_upgrade/1.1.5.5_to_1.2.0.1/upgrade.sh
+++ b/mosip_master/data_upgrade/1.1.5.5_to_1.2.0.1/upgrade.sh
@@ -8,8 +8,12 @@ then
     echo `date "+%m/%d/%Y %H:%M:%S"` ": Property file \"$properties_file\" found."
     while IFS='=' read -r key value
     do
-        key=$(echo $key | tr '.' '_')
-        eval ${key}=\${value}
+        key=$(echo "$key" | tr '.' '_')
+        if [[ "$key" =~ ^[A-Za-z_][A-Za-z0-9_]*$ ]]; then
+            printf -v "$key" '%s' "$value"
+        else
+            echo "WARNING: Skipping invalid property key: $key"
+        fi
     done < "$properties_file"
 else
      echo `date "+%m/%d/%Y %H:%M:%S"` ": Property file not found, Pass property file name as argument."
diff --git a/mosip_master/data_upgrade/1.2.0.1_to_1.3.0/data-uploader.py b/mosip_master/data_upgrade/1.2.0.1_to_1.3.0/data-uploader.py
index 8f2ec576..cc0ccd54 100644
--- a/mosip_master/data_upgrade/1.2.0.1_to_1.3.0/data-uploader.py
+++ b/mosip_master/data_upgrade/1.2.0.1_to_1.3.0/data-uploader.py
@@ -12,6 +12,7 @@
 import sys
 import time
 import psycopg2
+from psycopg2 import sql
 import openpyxl
 
 parser = argparse.ArgumentParser(description='This is CSV/xlsx file uploader script.invokes 1.2.0.1 bulk upload endpoints')
@@ -45,19 +46,23 @@ def getCurrentDateTime():
 
 
 def get_seed_value():
+  seed_value = None
   conn = psycopg2.connect(database="mosip_master", user = args.dbusername, password = args.dbpassword, host = args.dbhost, port = args.dbport)
   cursor = conn.cursor()
-  cursor.execute("select id from master."+args.table+" order by id desc limit 20")
+  cursor.execute(
+      sql.SQL("select id from master.{} order by id desc limit 20")
+      .format(sql.Identifier(args.table))
+  )
   for row in cursor.fetchall():
     id_value = row[0]
     if id_value is None:
       seed_value = 1000
       break
-    if id_value.isdigit():
+    if str(id_value).isdigit():
       seed_value = id_value
-      break;
-    
-  if seed_value == None:
+      break
+
+  if seed_value is None:
     seed_value = 1000
   return seed_value
 
@@ -95,8 +100,8 @@ def fill_series():
     print("Start Row: ", start_row)
     print("End Row: ", end_row)
 
-    if(start_row is None and end_row is None):
-      print("Need a valid start_row and end_row!")
+    if end_row is None:
+      print("Need a valid end_row!")
       return
 
     for i, value in enumerate(range(start_row, end_row + 1), start=1):
diff --git a/mosip_master/data_upgrade/1.2.0.1_to_1.3.0/upgrade.sh b/mosip_master/data_upgrade/1.2.0.1_to_1.3.0/upgrade.sh
index 2277ea46..b1d8306f 100755
--- a/mosip_master/data_upgrade/1.2.0.1_to_1.3.0/upgrade.sh
+++ b/mosip_master/data_upgrade/1.2.0.1_to_1.3.0/upgrade.sh
@@ -8,8 +8,12 @@ then
     echo `date "+%m/%d/%Y %H:%M:%S"` ": Property file \"$properties_file\" found."
     while IFS='=' read -r key value
     do
-        key=$(echo $key | tr '.' '_')
-        eval ${key}=\${value}
+        key=$(echo "$key" | tr '.' '_')
+        if [[ "$key" =~ ^[A-Za-z_][A-Za-z0-9_]*$ ]]; then
+            printf -v "$key" '%s' "$value"
+        else
+            echo "WARNING: Skipping invalid property key: $key"
+        fi
     done < "$properties_file"
 else
      echo `date "+%m/%d/%Y %H:%M:%S"` ": Property file not found, Pass property file name as argument."