diff --git a/lib/tasks/sync_geo_data.rake b/lib/tasks/sync_geo_data.rake
index ae5204e..d59510f 100644
--- a/lib/tasks/sync_geo_data.rake
+++ b/lib/tasks/sync_geo_data.rake
@@ -161,10 +161,12 @@ namespace :geo do
     count = 1
 
     cities.each do |data|
-      city = City.find_or_initialize_by!(name: data["name"])
+      country = Country.find_by!(code: data["country_code"])
+      state = State.find_by(code: data["state_code"])
 
-      country = Country.find_by(name: data["country_name"])
-      state = State.find_by(name: data["state_name"])
+      city = City.find_or_create_by!(name: data["name"]) do |c|
+        c.country_id = country.id
+      end
 
       puts "Syncing City[#{count}/#{sum}] [#{data["name"]}] Country:[#{country&.name}] "
       count += 1