diff --git a/app/jobs/failed_recurring_donation_payment_donor_email_job.rb b/app/jobs/failed_recurring_donation_payment_donor_email_job.rb
new file mode 100644
index 00000000..43a812c3
--- /dev/null
+++ b/app/jobs/failed_recurring_donation_payment_donor_email_job.rb
@@ -0,0 +1,7 @@
+class FailedRecurringDonationPaymentDonorEmailJob < ApplicationJob
+  queue_as :default
+
+  def perform(donation)
+    DonationMailer.donor_failed_recurring_donation(donation.id).deliver_now
+  end
+end
diff --git a/app/jobs/failed_recurring_donation_payment_job.rb b/app/jobs/failed_recurring_donation_payment_job.rb
new file mode 100644
index 00000000..098d24e0
--- /dev/null
+++ b/app/jobs/failed_recurring_donation_payment_job.rb
@@ -0,0 +1,8 @@
+class FailedRecurringDonationPaymentJob < ApplicationJob
+  queue_as :default
+
+  def perform
+    FailedRecurringDonationPaymentDonorEmailJob.perform_later donation
+    FailedRecurringDonationPaymentNonprofitEmailJob.perform_later donation
+  end
+end
diff --git a/app/jobs/failed_recurring_donation_payment_nonprofit_email_job.rb b/app/jobs/failed_recurring_donation_payment_nonprofit_email_job.rb
new file mode 100644
index 00000000..74022571
--- /dev/null
+++ b/app/jobs/failed_recurring_donation_payment_nonprofit_email_job.rb
@@ -0,0 +1,7 @@
+class FailedRecurringDonationPaymentNonprofitEmailJob < ApplicationJob
+  queue_as :default
+
+  def perform(donation)
+    DonationMailer.nonprofit_failed_recurring_donation(donation.id).deliver_now
+  end
+end
diff --git a/lib/job_types/donor_failed_recurring_donation_job.rb b/lib/job_types/donor_failed_recurring_donation_job.rb
deleted file mode 100644
index 272ab40e..00000000
--- a/lib/job_types/donor_failed_recurring_donation_job.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-# License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
-module JobTypes
-  class DonorFailedRecurringDonationJob < EmailJob
-    attr_reader :donation_id
-
-    def initialize(donation_id)
-      @donation_id = donation_id
-    end
-
-    def perform
-      DonationMailer.donor_failed_recurring_donation(@donation_id).deliver
-    end
-  end
-end
diff --git a/lib/job_types/nonprofit_failed_recurring_donation_job.rb b/lib/job_types/nonprofit_failed_recurring_donation_job.rb
deleted file mode 100644
index 76bf5ce9..00000000
--- a/lib/job_types/nonprofit_failed_recurring_donation_job.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-# License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
-module JobTypes
-  class NonprofitFailedRecurringDonationJob < EmailJob
-    attr_reader :donation_id
-
-    def initialize(donation_id)
-      @donation_id = donation_id
-    end
-
-    def perform
-      DonationMailer.nonprofit_failed_recurring_donation(@donation_id).deliver
-    end
-  end
-end
diff --git a/spec/lib/job_types/donor_failed_recurring_donation_job_spec.rb b/spec/lib/job_types/donor_failed_recurring_donation_job_spec.rb
deleted file mode 100644
index 6ab07a73..00000000
--- a/spec/lib/job_types/donor_failed_recurring_donation_job_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-# License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
-require 'rails_helper.rb'
-
-describe JobTypes::DonorFailedRecurringDonationJob do
-  describe '.perform' do
-    it 'calls the correct active mailer' do
-      expect(DonationMailer).to receive(:donor_failed_recurring_donation).with(1).and_wrap_original { |_m, *_args| mailer = double('object'); expect(mailer).to receive(:deliver).and_return(nil); mailer }
-
-      job = JobTypes::DonorFailedRecurringDonationJob.new(1)
-      job.perform
-    end
-  end
-end
diff --git a/spec/lib/job_types/nonprofit_failed_recurring_donation_job_spec.rb b/spec/lib/job_types/nonprofit_failed_recurring_donation_job_spec.rb
deleted file mode 100644
index 3872cf1f..00000000
--- a/spec/lib/job_types/nonprofit_failed_recurring_donation_job_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-# License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
-require 'rails_helper.rb'
-
-describe JobTypes::NonprofitFailedRecurringDonationJob do
-  describe '.perform' do
-    it 'calls the correct active mailer' do
-      expect(DonationMailer).to receive(:nonprofit_failed_recurring_donation).with(1).and_wrap_original { |_m, *_args| mailer = double('object'); expect(mailer).to receive(:deliver).and_return(nil); mailer }
-
-      job = JobTypes::NonprofitFailedRecurringDonationJob.new(1)
-      job.perform
-    end
-  end
-end