diff --git a/db/schema.rb b/db/schema-read-only.rb
similarity index 98%
rename from db/schema.rb
rename to db/schema-read-only.rb
index 19b75088b..7a0b84e08 100644
--- a/db/schema.rb
+++ b/db/schema-read-only.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150701074344) do
+ActiveRecord::Schema.define(version: 20150703090039) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -932,14 +932,14 @@ ActiveRecord::Schema.define(version: 20150701074344) do
   end
 
   create_table "que_jobs", id: false, force: :cascade do |t|
-    t.integer  "priority",    limit: 2, default: 100,                   null: false
-    t.datetime "run_at",                default: '2015-06-29 12:38:58', null: false
-    t.integer  "job_id",      limit: 8, default: 0,                     null: false
-    t.text     "job_class",                                             null: false
-    t.json     "args",                  default: [],                    null: false
-    t.integer  "error_count",           default: 0,                     null: false
+    t.integer  "priority",    limit: 2, default: 100,                                        null: false
+    t.datetime "run_at",                default: "now()",                                    null: false
+    t.integer  "job_id",      limit: 8, default: "nextval('que_jobs_job_id_seq'::regclass)", null: false
+    t.text     "job_class",                                                                  null: false
+    t.json     "args",                  default: [],                                         null: false
+    t.integer  "error_count",           default: 0,                                          null: false
     t.text     "last_error"
-    t.text     "queue",                 default: "",                    null: false
+    t.text     "queue",                 default: "",                                         null: false
   end
 
   create_table "registrant_verifications", force: :cascade do |t|
diff --git a/db/structure.sql b/db/structure.sql
index 271e8d8ae..825f82db0 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -4851,3 +4851,7 @@ INSERT INTO schema_migrations (version) VALUES ('20150612123111');
 
 INSERT INTO schema_migrations (version) VALUES ('20150701074344');
 
+INSERT INTO schema_migrations (version) VALUES ('20150703074448');
+
+INSERT INTO schema_migrations (version) VALUES ('20150703090039');
+
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index cd022bcb1..4e115b471 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -1,12 +1,38 @@
+Rake::Task["db:schema:load"].clear
+
+Rake::Task["db:migrate"].enhance do
+  if ActiveRecord::Base.schema_format == :sql
+    Rake::Task["db:schema:dump"].invoke
+  end
+end
+
+Rake::Task["db:schema:dump"].enhance do
+  if ActiveRecord::Base.schema_format == :sql
+    File.rename('db/schema.rb', 'db/schema-read-only.rb')
+    Rake::Task["db:structure:dump"].invoke # for users who do manually db:schema:dump
+  end
+end
+
 namespace :db do
+  namespace :schema do
+    task load: [:environment, :load_config] do
+      puts 'Only rake db:structure:load is supported and invoked now. Otherwise zonefile generation does not work nor que.'
+      Rake::Task["db:structure:load"].invoke
+    end
+  end
+
   def databases
     @db ||= [Rails.env, "api_log_#{Rails.env}", "whois_#{Rails.env}"]
   end
 
+  def other_databases
+    @other_dbs ||= ["api_log_#{Rails.env}", "whois_#{Rails.env}"]
+  end
+
   def schema_file(db)
     case db
     when Rails.env
-      'schema.rb'
+      'structure.sql' # just in case
     when "api_log_#{Rails.env}"
       'api_log_schema.rb'
     when "whois_#{Rails.env}"
@@ -25,7 +51,7 @@ namespace :db do
 
       puts "\n---------------------------- Import seed ----------------------------------------\n"
       Rake::Task['db:seed'].invoke
-      Rake::Task['zonefile:replace_procedure'].invoke
+      # Rake::Task['zonefile:replace_procedure'].invoke # not needed any more
       puts "\n  All done!\n\n"
     end
 
@@ -73,7 +99,10 @@ namespace :db do
     namespace :schema do
       desc 'Schema load for all databases: registry, api_log and whois'
       task load: [:environment, :load_config] do
-        databases.each do |name|
+        puts "\n------------------------ #{Rails.env} structure loading -----------------------------\n"
+        Rake::Task['db:structure:load'].invoke
+
+        other_databases.each do |name|
           begin
             puts "\n------------------------ #{name} schema loading -----------------------------\n"
             ActiveRecord::Base.clear_all_connections!
@@ -89,9 +118,12 @@ namespace :db do
         end
       end
 
-      desc 'Schema load for all databases: registry, api_log and whois'
+      desc 'Schema dump for all databases: registry, api_log and whois'
       task dump: [:environment, :load_config] do
-        databases.each do |name|
+        puts "\n---------------------------- #{Rails.env} structure and schema dump--------------\n"
+        Rake::Task['db:schema:dump'].invoke # dumps both schema and structure
+
+        other_databases.each do |name|
           begin
             puts "\n---------------------------- #{name} ----------------------------------------\n"
             filename = "#{Rails.root}/db/#{schema_file(name)}"
@@ -104,6 +136,17 @@ namespace :db do
           end
         end
       end
+      # alias names
+      namespace :structure do
+        desc '(alias) Schema dump for all databases: registry, api_log and whois'
+        task :dump do
+          Rake::Task['db:all:schema:dump'].invoke
+        end
+        desc '(alias) Schema load for all databases: registry, api_log and whois'
+        task :load do
+          Rake::Task['db:all:schema:load'].invoke
+        end
+      end
     end
   end
 end