diff --git a/db/default/spree/states.yml b/db/default/spree/states.yml
index 305e21ab39..134f0d8f2c 100644
--- a/db/default/spree/states.yml
+++ b/db/default/spree/states.yml
@@ -1,41 +1,33 @@
-#Australia
-states_101:
-  name: Tasmania
+---
+- name: Tasmania
   country_id: "12"
   id: "101"
   abbr: Tas
-states_102:
-  name: Victoria
+- name: Victoria
   country_id: "12"
   id: "102"
   abbr: Vic
-states_103:
-  name: New South Wales
+- name: New South Wales
   country_id: "12"
   id: "103"
   abbr: NSW
-states_104:
-  name: ACT
+- name: ACT
   country_id: "12"
   id: "104"
   abbr: ACT
-states_105:
-  name: Queensland
+- name: Queensland
   country_id: "12"
   id: "105"
   abbr: QLD
-states_106:
-  name: South Australia
+- name: South Australia
   country_id: "12"
   id: "106"
   abbr: SA
-states_107:
-  name: Northern Territory
+- name: Northern Territory
   country_id: "12"
   id: "107"
   abbr: NT
-states_108:
-  name: Western Australia
+- name: Western Australia
   country_id: "12"
   id: "108"
-  abbr: WA
\ No newline at end of file
+  abbr: WA
diff --git a/db/seeds.rb b/db/seeds.rb
index 82f95651bd..9f9bc1efca 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,28 +1,31 @@
 # This file should contain all the record creation needed to seed the database with its default values.
 # The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+require 'yaml'
 
 # -- Spree
-unless Spree::Country.find_by_name 'Australia'
+unless Spree::Country.find_by_iso(ENV['DEFAULT_COUNTRY_CODE'])
   puts "[db:seed] Seeding Spree"
   Spree::Core::Engine.load_seed if defined?(Spree::Core)
   Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
 end
 
-# -- States
-unless Spree::State.find_by_name 'Victoria'
-  country = Spree::Country.find_by_name('Australia')
-  puts "[db:seed] Seeding states"
+country = Spree::Country.find_by_iso(ENV['DEFAULT_COUNTRY_CODE'])
+puts "Country is #{country.to_s}"
 
-  [
-   ['ACT', 'ACT'],
-   ['New South Wales', 'NSW'],
-   ['Northern Territory', 'NT'],
-   ['Queensland', 'QLD'],
-   ['South Australia', 'SA'],
-   ['Tasmania', 'Tas'],
-   ['Victoria', 'Vic'],
-   ['Western Australia', 'WA']
-  ].each do |state|
-    Spree::State.create!({"name"=>state[0], "abbr"=>state[1], :country=>country}, :without_protection => true)
+puts "[db:seed] loading states yaml"
+states = YAML::load_file "db/default/spree/states.yml"
+puts "States: #{states.to_s}"
+
+# -- Seeding States
+puts "[db:seed] Seeding states for " + country.name
+
+states.each do |state|
+  puts "State: " + state.to_s
+
+  unless Spree::State.find_by_name(state['name'])
+    Spree::State.create!(
+      { name: state['name'], abbr: state['abbr'], country: country },
+      without_protection: true
+    )
   end
 end