diff --git a/suppliers_portal/patches/fix_addresses.py b/suppliers_portal/patches/fix_addresses.py
new file mode 100644
index 0000000..4fff369
--- /dev/null
+++ b/suppliers_portal/patches/fix_addresses.py
@@ -0,0 +1,84 @@
+import json
+import re
+
+import frappe
+from frappe.utils import getdate, update_progress_bar
+
+from suppliers_portal.patches.move_invoices_to_erpnext import get_site_code
+
+
+def execute():
+	migrate_site_code_address()
+	fix_invoices_shipping_addresses()
+	remove_supplier_links()
+
+
+def remove_supplier_links():
+	suppliers_file = frappe.get_site_path("private", "backups", "suppliers.json")
+	with open(suppliers_file) as f:
+		suppliers = json.load(f)
+		for idx, supplier in enumerate(suppliers):
+			if not frappe.db.exists("Supplier", supplier.get("name")):
+				continue
+			update_progress_bar(f"Updating Supplier Addresses: {idx}", idx, (len(suppliers)))
+			linked_addresses = frappe.get_all(
+				"Dynamic Link",
+				{"link_doctype": "Supplier", "link_name": supplier.get("name"), "parenttype": "Address"},
+				["name", "parent"],
+			)
+			address = frappe.new_doc("Address")
+			address.update(
+				{
+					"address_type": "Billing",
+					"address_title": supplier.get("company_name"),
+					"address_line1": supplier.get("street") or "No Street Address",
+					"city": supplier.get("city") or "Unknown",
+					"state": supplier.get("state"),
+					"pincode": supplier.get("zip_code"),
+					"country": "United States",
+					"is_primary_address": True,
+					"is_shipping_address": True,
+					"links": [
+						{
+							"link_doctype": "Supplier",
+							"link_name": supplier.get("name"),
+						},
+					],
+				}
+			)
+			address.insert(ignore_permissions=True)
+			if len(linked_addresses):
+				for linked_address in linked_addresses:
+					frappe.rename_doc("Address", linked_address.parent, address.name, merge=True, force=True)
+
+
+def fix_invoices_shipping_addresses():
+	invoices = frappe.get_all("Purchase Invoice", {"site_code": ["is", "set"]}, ["name", "site_code"])
+	for idx, invoice in enumerate(invoices):
+		update_progress_bar("Updating invoice addresses", idx, (len(invoices)))
+		frappe.db.set_value(
+			"Purchase Invoice", invoice.name, "shipping_address", invoice.site_code, update_modified=False
+		)
+		if frappe.db.exists("Address", invoice.site_code):
+			frappe.db.set_value(
+				"Purchase Invoice", invoice.name, "shipping_address", invoice.site_code, update_modified=False
+			)
+
+
+def migrate_site_code_address():
+	linked_addresses = frappe.get_all(
+		"Dynamic Link", {"link_doctype": "Site Code", "parenttype": "Address"}, ["parent", "link_name"]
+	)
+	for idx, site in enumerate(linked_addresses):
+		update_progress_bar("Updating Site Codes", idx, (len(linked_addresses)))
+		if site.parent[-1].isdigit():
+			merge = True if frappe.db.exists("Address", site.link_name) else False
+			frappe.rename_doc("Address", site.parent, f"{site.link_name}", merge=merge)
+			continue
+		frappe.db.set_value("Site Code", site.link_name, "address", site.parent)
+		frappe.db.set_value("Address", site.parent, "address_title", site.link_name)
+		frappe.db.set_value("Address", site.parent, "address_title", site.link_name)
+		try:
+			frappe.rename_doc("Address", site.parent, f"{site.link_name}")
+		except frappe.ValidationError:
+			frappe.rename_doc("Address", site.parent, f"{site.link_name}", merge=True)
diff --git a/suppliers_portal/suppliers_portal/doctype/site_code/site_code.json b/suppliers_portal/suppliers_portal/doctype/site_code/site_code.json
index ac14edc..26e66da 100644
--- a/suppliers_portal/suppliers_portal/doctype/site_code/site_code.json
+++ b/suppliers_portal/suppliers_portal/doctype/site_code/site_code.json
@@ -4,7 +4,7 @@
 	"creation": "2025-06-17 01:51:35.709515",
 	"doctype": "DocType",
 	"engine": "InnoDB",
-	"field_order": ["site_code", "column_break_pwyn", "addresses_section", "address_html"],
+	"field_order": ["site_code", "column_break_pwyn", "address", "addresses_section", "address_html"],
 	"fields": [
 		{
 			"fieldname": "site_code",
@@ -15,7 +15,6 @@
 			"in_standard_filter": 1,
 			"label": "Site Code",
 			"no_copy": 1,
-			"not_nullable": 1,
 			"reqd": 1,
 			"unique": 1
 		},
@@ -34,11 +33,17 @@
 			"fieldname": "addresses_section",
 			"fieldtype": "Section Break",
 			"label": "Addresses"
+		},
+		{
+			"fieldname": "address",
+			"fieldtype": "Link",
+			"label": "Address",
+			"options": "Address"
 		}
 	],
 	"index_web_pages_for_search": 1,
 	"links": [],
-	"modified": "2025-06-17 02:29:32.191624",
+	"modified": "2025-07-01 16:15:49.066309",
 	"modified_by": "Administrator",
 	"module": "Suppliers Portal",
 	"name": "Site Code",
@@ -58,6 +63,7 @@
 			"write": 1
 		}
 	],
+	"row_format": "Dynamic",
 	"sort_field": "creation",
 	"sort_order": "DESC",
 	"states": [],
diff --git a/suppliers_portal/suppliers_portal/doctype/site_code/site_code.py b/suppliers_portal/suppliers_portal/doctype/site_code/site_code.py
index 9c41985..4a2fa5e 100644
--- a/suppliers_portal/suppliers_portal/doctype/site_code/site_code.py
+++ b/suppliers_portal/suppliers_portal/doctype/site_code/site_code.py
@@ -14,6 +14,7 @@ class SiteCode(Document):
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
+		address: DF.Link | None
 		site_code: DF.Data
 	# end: auto-generated types