1 files changed, 6 insertions, 6 deletions
diff --git a/app/services/deployments/older_deployments_drop_service.rb b/app/services/deployments/older_deployments_drop_service.rb
index 100d1267848..504b55b99ac 100644
--- a/app/services/deployments/older_deployments_drop_service.rb
+++ b/app/services/deployments/older_deployments_drop_service.rb
@@ -11,23 +11,23 @@ module Deployments
     def execute
       return unless @deployment&.running?
 
-      older_deployments.find_each do |older_deployment|
-        Gitlab::OptimisticLocking.retry_lock(older_deployment.deployable, name: 'older_deployments_drop') do |deployable|
-          deployable.drop(:forward_deployment_failure)
+      older_deployments_builds.each do |build|
+        Gitlab::OptimisticLocking.retry_lock(build, name: 'older_deployments_drop') do |build|
+          build.drop(:forward_deployment_failure)
         end
       rescue StandardError => e
-        Gitlab::ErrorTracking.track_exception(e, subject_id: @deployment.id, deployment_id: older_deployment.id)
+        Gitlab::ErrorTracking.track_exception(e, subject_id: @deployment.id, build_id: build.id)
       end
     end
 
     private
 
-    def older_deployments
+    def older_deployments_builds
       @deployment
         .environment
         .active_deployments
         .older_than(@deployment)
-        .with_deployable
+        .builds
     end
   end
 end