1 files changed, 3 insertions, 2 deletions
diff --git a/app/services/ci/update_build_state_service.rb b/app/services/ci/update_build_state_service.rb
index 826d9a2eda3..9df36b86404 100644
--- a/app/services/ci/update_build_state_service.rb
+++ b/app/services/ci/update_build_state_service.rb
@@ -216,11 +216,12 @@ module Ci
     end
 
     def chunks_migration_enabled?
-      ::Gitlab::Ci::Features.accept_trace?(build.project)
+      ::Feature.enabled?(:ci_enable_live_trace, build.project) &&
+        ::Feature.enabled?(:ci_accept_trace, build.project, type: :ops, default_enabled: true)
     end
 
     def log_invalid_chunks?
-      ::Gitlab::Ci::Features.log_invalid_trace_chunks?(build.project)
+      ::Feature.enabled?(:ci_trace_log_invalid_chunks, build.project, type: :ops, default_enabled: false)
     end
   end
 end