diff --git a/app/models/job.rb b/app/models/job.rb
index 3b3a33b..20fbc38 100644
--- a/app/models/job.rb
+++ b/app/models/job.rb
@@ -1,100 +1,104 @@
 class Job < ActiveRecord::Base
   belongs_to :domain
 
   scope :pending, -> { where(status: 0) }
   scope :completed, -> { where(status: [1, 2]) }
 
   def failed?
     status == 2
   end
 
   def arguments
     JSON.parse(args)
   end
 
   class << self
     def add_domain(domain)
       ActiveRecord::Base.transaction do
         jobs_for_domain(domain, :add_domain)
 
         trigger_event(domain, :installed)
       end
     end
 
     def shutdown_domain(domain)
       ActiveRecord::Base.transaction do
         job_for_domain(domain, :remove_domain)
         job_for_domain(domain, :opendnssec_remove) if domain.dnssec?
 
         trigger_event(domain, :cleaned_up)
       end
     end
 
     def dnssec_sign(domain)
       ActiveRecord::Base.transaction do
         job_for_domain(domain, :opendnssec_add, policy: domain.dnssec_policy.name)
         job_for_domain(domain, :bind_convert_to_dnssec)
 
         trigger_event(domain, :signed)
       end
     end
 
     def wait_for_ready(domain)
       jobs_for_domain(domain,
                       :wait_for_ready_to_push_ds)
     end
 
     def dnssec_push_ds(domain, dss)
       opts = Hash[:dnssec_parent, domain.dnssec_parent,
                   :dnssec_parent_authority, domain.dnssec_parent_authority,
                   :dss, dss]
+      keytag = dss.map { |ds| ds.split.first }.first # Both records should have the same keytag
+
       ActiveRecord::Base.transaction do
         job_for_domain(domain, :publish_ds, opts)
-        job_for_domain(domain, :wait_for_active)
+        job_for_domain(domain, :wait_for_active, keytag: keytag)
 
         trigger_event(domain, :converted)
       end
     end
 
     def dnssec_rollover_ds(domain, dss)
       opts = Hash[:dnssec_parent, domain.dnssec_parent,
                   :dnssec_parent_authority, domain.dnssec_parent_authority,
                   :dss, dss]
+
+      keytag = dss.map { |ds| ds.split.first }.first # Both records should have the same keytag
       ActiveRecord::Base.transaction do
         job_for_domain(domain, :publish_ds, opts)
-        job_for_domain(domain, :wait_for_active)
+        job_for_domain(domain, :wait_for_active, keytag: keytag)
 
         trigger_event(domain, :complete_rollover)
       end
     end
 
     def convert_to_plain(domain)
       ActiveRecord::Base.transaction do
         jobs_for_domain(domain,
                         :remove_domain,
                         :add_domain,
                         :opendnssec_remove)
 
         trigger_event(domain, :converted)
       end
     end
 
     private
 
     def trigger_event(domain, event)
       job_for_domain(domain, :trigger_event, event: event)
     end
 
     def jobs_for_domain(domain, *job_names)
       job_names.each { |job_name| job_for_domain(domain, job_name) }
     end
 
     def job_for_domain(domain, job_name, args = {})
       args = { zone: domain.name }.merge!(args)
 
       create!(domain: domain, job_type: job_name, args: args.to_json)
     end
 
   end
 
 end