diff --git a/db/default/countries.rb b/db/default/countries.rb
index 8e96d47f4f..1df48ed11b 100644
--- a/db/default/countries.rb
+++ b/db/default/countries.rb
@@ -227,4 +227,4 @@ Spree::Country.create!([
   { name: "Saint Kitts and Nevis", iso3: "KNA", iso: "KN", iso_name: "SAINT KITTS AND NEVIS", numcode: "659" },
   { name: "Serbia", iso3: "SRB", iso: "RS", "iso_name" => "SERBIA", numcode: "999" }
 ])
-Spree::Config[:default_country_id] = Spree::Country.find_by(name: "United States").id
+Spree::Config[:default_country_id] = Spree::Country.find_by(iso: ENV.fetch("DEFAULT_COUNTRY_CODE", "US")).id
diff --git a/db/default/states.yml b/db/default/spree/states.yml
similarity index 100%
rename from db/default/states.yml
rename to db/default/spree/states.yml
diff --git a/db/default/zones.rb b/db/default/zones.rb
index 19d04ca090..10dd53b1d2 100644
--- a/db/default/zones.rb
+++ b/db/default/zones.rb
@@ -1,15 +1,19 @@
-eu_vat = Spree::Zone.create!(name: "EU_VAT", description: "Countries that make up the EU VAT zone.")
-north_america = Spree::Zone.create!(name: "North America", description: "USA + Canada")
+unless Spree::Zone.find_by(name: "EU_VAT")
+  eu_vat = Spree::Zone.create!(name: "EU_VAT", description: "Countries that make up the EU VAT zone.")
 
-["Poland", "Finland", "Portugal", "Romania", "Germany", "France",
- "Slovakia", "Hungary", "Slovenia", "Ireland", "Austria", "Spain",
- "Italy", "Belgium", "Sweden", "Latvia", "Bulgaria", "United Kingdom",
- "Lithuania", "Cyprus", "Luxembourg", "Malta", "Denmark", "Netherlands",
- "Estonia"].
-each do |name|
-  eu_vat.zone_members.create!(zoneable: Spree::Country.find_by!(name: name))
+  ["Poland", "Finland", "Portugal", "Romania", "Germany", "France",
+   "Slovakia", "Hungary", "Slovenia", "Ireland", "Austria", "Spain",
+   "Italy", "Belgium", "Sweden", "Latvia", "Bulgaria", "United Kingdom",
+   "Lithuania", "Cyprus", "Luxembourg", "Malta", "Denmark", "Netherlands",
+   "Estonia"].each do |name|
+    eu_vat.zone_members.create!(zoneable: Spree::Country.find_by!(name: name))
+  end
 end
 
-["United States", "Canada"].each do |name|
-  north_america.zone_members.create!(zoneable: Spree::Country.find_by!(name: name))
+unless Spree::Zone.find_by(name: "North America")
+  north_america = Spree::Zone.create!(name: "North America", description: "USA + Canada")
+
+  ["United States", "Canada"].each do |name|
+    north_america.zone_members.create!(zoneable: Spree::Country.find_by!(name: name))
+  end
 end
diff --git a/db/seeds.rb b/db/seeds.rb
index 332e634d78..8d030ac050 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -32,7 +32,7 @@ country = Spree::Country.find_by(iso: ENV['DEFAULT_COUNTRY_CODE'])
 puts "Default country is #{country.to_s}"
 
 puts "[db:seed] Seeding states for " + country.name
-states = YAML::load_file "db/default/states.yml"
+states = YAML::load_file "db/default/spree/states.yml"
 states.each do |state|
   puts "State: " + state.to_s
   unless Spree::State.find_by(name: state['name'])