diff --git a/temba/locations/migrations/0034_populate_locations.py b/temba/locations/migrations/0034_populate_locations.py
new file mode 100644
index 00000000000..03e173809b5
--- /dev/null
+++ b/temba/locations/migrations/0034_populate_locations.py
@@ -0,0 +1,57 @@
+# Generated by Django 5.1.4 on 2025-01-09 10:50
+import geojson
+
+from django.db import migrations
+
+
+def populate_locations(apps, schema_editor):
+    Org = apps.get_model("orgs", "Org")
+    AdminBoundary = apps.get_model("locations", "AdminBoundary")
+    BoundaryAlias = apps.get_model("locations", "BoundaryAlias")
+    Location = apps.get_model("locations", "Location")
+    LocationAlias = apps.get_model("locations", "LocationAlias")
+
+    location_id_by_boundary_id = {}
+    location_id_by_country_id = {}
+
+    boundaries = AdminBoundary.objects.all().order_by("level", "osm_id").select_related("parent")
+    for boundary in boundaries:
+        geometry = geojson.loads(boundary.simplified_geometry.geojson)
+        obj = Location.objects.create(
+            osm_id=boundary.osm_id,
+            name=boundary.name,
+            level=boundary.level,
+            parent_id=None if not boundary.parent else location_id_by_boundary_id[boundary.parent_id],
+            path=boundary.path,
+            geometry=geometry,
+            lft=boundary.lft,
+            rght=boundary.rght,
+            tree_id=boundary.tree_id,
+        )
+        location_id_by_boundary_id[boundary.id] = obj.id
+        if boundary.level == 0:
+            location_id_by_country_id[boundary.id] = obj.id
+
+    orgs = Org.objects.all().exclude(country=None)
+    for org in orgs:
+        org.location_id = location_id_by_country_id[org.country_id]
+        org.save(update_fields=("location_id",))
+
+    aliases = BoundaryAlias.objects.all().order_by("org")
+    for alias in aliases:
+        LocationAlias.objects.create(
+            org_id=alias.org_id,
+            location_id=location_id_by_boundary_id[alias.boundary_id],
+            name=alias.name,
+            modified_by_id=alias.created_by_id,
+            created_by_id=alias.created_by_id,
+        )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("locations", "0033_location_locationalias_location_locations_by_name_and_more"),
+    ]
+
+    operations = [migrations.RunPython(populate_locations, migrations.RunPython.noop)]
diff --git a/temba/locations/tests/test_migrations.py b/temba/locations/tests/test_migrations.py
new file mode 100644
index 00000000000..2f8db3155a4
--- /dev/null
+++ b/temba/locations/tests/test_migrations.py
@@ -0,0 +1,69 @@
+from django.contrib.gis.geos.collections import MultiPolygon
+from django.core.management import call_command
+
+from temba.locations.models import AdminBoundary, BoundaryAlias, Location, LocationAlias
+from temba.tests import MigrationTest, matchers
+
+
+class PopulateLocationsTest(MigrationTest):
+    app = "locations"
+    migrate_from = "0033_location_locationalias_location_locations_by_name_and_more"
+    migrate_to = "0034_populate_locations"
+
+    def setUpBeforeMigration(self, apps):
+        self.assertEqual(0, AdminBoundary.objects.all().count())
+        call_command("import_geojson", "test-data/rwanda.zip")
+        self.assertEqual(9, AdminBoundary.objects.all().count())
+
+        self.country = AdminBoundary.objects.get(level=0)
+        self.assertIsInstance(self.country.simplified_geometry, MultiPolygon)
+        self.assertEqual(self.country.simplified_geometry.geojson, matchers.String())
+
+        self.state1 = AdminBoundary.objects.get(name="Kigali City", level=1)
+        self.district1 = AdminBoundary.objects.get(name="Gasabo District", level=2)
+
+        BoundaryAlias.create(self.org, self.admin, self.state1, "Kigari")
+        BoundaryAlias.create(self.org2, self.admin2, self.state1, "Chigali")
+
+        self.country.update_path()
+
+        self.org.country = self.country
+        self.org.save(update_fields=("country",))
+
+        self.assertEqual(9, AdminBoundary.objects.all().count())
+        self.assertEqual(2, BoundaryAlias.objects.all().count())
+
+        self.assertIsNone(self.org.location)
+        self.assertEqual(0, Location.objects.all().count())
+        self.assertEqual(0, LocationAlias.objects.all().count())
+
+    def test_migrations(self):
+        self.org.refresh_from_db()
+        self.assertIsNotNone(self.org.location)
+        country_location = Location.objects.filter(level=0).get()
+        self.assertEqual(country_location, self.org.location)
+        self.assertEqual(country_location.geometry, matchers.Dict())
+
+        self.org2.refresh_from_db()
+        self.assertIsNone(self.org2.country)
+        self.assertIsNone(self.org2.location)
+
+        self.assertEqual(9, AdminBoundary.objects.all().count())
+        self.assertEqual(2, BoundaryAlias.objects.all().count())
+
+        self.assertEqual(9, Location.objects.all().count())
+        self.assertEqual(2, LocationAlias.objects.all().count())
+
+        self.assertEqual(1, Location.objects.filter(level=0).count())
+        self.assertEqual(5, Location.objects.filter(level=1).count())
+        self.assertEqual(3, Location.objects.filter(level=2).count())
+        self.assertEqual(0, Location.objects.filter(level=3).count())
+
+        self.assertEqual(1, LocationAlias.objects.filter(org=self.org).count())
+        self.assertEqual("Kigari", LocationAlias.objects.filter(org=self.org).get().name)
+
+        self.assertEqual(1, LocationAlias.objects.filter(org=self.org2).count())
+        self.assertEqual("Chigali", LocationAlias.objects.filter(org=self.org2).get().name)
+        self.org2.refresh_from_db()
+        self.assertIsNone(self.org2.country)
+        self.assertIsNone(self.org2.location)
diff --git a/test-data/rwanda.zip b/test-data/rwanda.zip
new file mode 100644
index 00000000000..bc636dfa4ff
Binary files /dev/null and b/test-data/rwanda.zip differ