diff --git a/ee/app/services/package_metadata/ingestion/advisory/advisory_ingestion_task.rb b/ee/app/services/package_metadata/ingestion/advisory/advisory_ingestion_task.rb
index 5e0e66361ba725b4531afee0407aa2cfbbf59ced..33111ba7dfeb73a6c2980732433d2727450fd644 100644
--- a/ee/app/services/package_metadata/ingestion/advisory/advisory_ingestion_task.rb
+++ b/ee/app/services/package_metadata/ingestion/advisory/advisory_ingestion_task.rb
@@ -20,7 +20,12 @@ def execute
             returns: %w[advisory_xid source_xid id published_date])
 
           map = results.each_with_object({}) do |(advisory_xid, source_xid, id, published_date), acc|
-            acc[advisory_xid] = Hashie::Mash.new({ id: id, source_xid: source_xid, published_date: published_date })
+            acc[advisory_xid] = Hashie::Mash.new({
+              id: id,
+              source_xid: source_xid,
+              advisory_xid: advisory_xid,
+              published_date: published_date
+            })
           end
           advisory_map.merge!(map)
         end
diff --git a/ee/app/services/package_metadata/ingestion/advisory/ingestion_service.rb b/ee/app/services/package_metadata/ingestion/advisory/ingestion_service.rb
index f11c082ac0e12bfd514c50f235df14eb9a19ef29..73c2eb1fada2fc17e9b7aad1d05367f99a082ed6 100644
--- a/ee/app/services/package_metadata/ingestion/advisory/ingestion_service.rb
+++ b/ee/app/services/package_metadata/ingestion/advisory/ingestion_service.rb
@@ -40,7 +40,7 @@ def publish!
 
             if source_xid == 'trivy-db' && Feature.disabled?(:container_scanning_continuous_vulnerability_scans,
               Feature.current_request, type: :beta)
-              log_skipped_advisory(source_xid, advisory_xid)
+              log_skipped_advisory_scan(source_xid, advisory_xid)
               next
             end
 
@@ -69,7 +69,7 @@ def log_queued_advisory_scan(source_xid, advisory_xid)
             source_xid: source_xid, advisory_xid: advisory_xid)
         end
 
-        def log_skipped_advisory(source_xid, advisory_xid)
+        def log_skipped_advisory_scan(source_xid, advisory_xid)
           Gitlab::AppJsonLogger.warn(message: 'Skipped scan for advisory',
             source_xid: source_xid, advisory_xid: advisory_xid)
         end
diff --git a/ee/spec/services/package_metadata/ingestion/advisory/advisory_ingestion_task_spec.rb b/ee/spec/services/package_metadata/ingestion/advisory/advisory_ingestion_task_spec.rb
index a4f493a794360106b2d2bdee55c993d0a3928f57..55bcd3e640706ab3564d3ed8eb8153d319d5e3fc 100644
--- a/ee/spec/services/package_metadata/ingestion/advisory/advisory_ingestion_task_spec.rb
+++ b/ee/spec/services/package_metadata/ingestion/advisory/advisory_ingestion_task_spec.rb
@@ -36,8 +36,12 @@
         expected_advisory_map = {}
         PackageMetadata::Advisory.all.each do |advisory|
           expected_advisory_map[advisory.advisory_xid] =
-            Hashie::Mash.new({ id: advisory.id, source_xid: advisory.source_xid,
-published_date: advisory.published_date })
+            Hashie::Mash.new({
+              id: advisory.id,
+              source_xid: advisory.source_xid,
+              advisory_xid: advisory.advisory_xid,
+              published_date: advisory.published_date
+            })
         end
         expect(actual_advisory_map).to eq(expected_advisory_map)
       end
diff --git a/ee/spec/services/package_metadata/ingestion/advisory/ingestion_service_spec.rb b/ee/spec/services/package_metadata/ingestion/advisory/ingestion_service_spec.rb
index 54d4d7efab907073f8ea762ae27a6d889cbf1ddc..30a05b1e62be1ea07c38516a8185a73b42fa1adf 100644
--- a/ee/spec/services/package_metadata/ingestion/advisory/ingestion_service_spec.rb
+++ b/ee/spec/services/package_metadata/ingestion/advisory/ingestion_service_spec.rb
@@ -59,13 +59,13 @@
 
         if cs_ff_enabled
           expect(Gitlab::AppJsonLogger).to have_received(:info)
-            .with(message: 'Queued scan for advisory', source_xid: anything, advisory_xid: anything)
+            .with(message: 'Queued scan for advisory', source_xid: be_present, advisory_xid: be_present)
             .at_least(:once)
         end
 
         unless cs_ff_enabled
           expect(Gitlab::AppJsonLogger).to have_received(:warn)
-            .with(message: 'Skipped scan for advisory', source_xid: anything, advisory_xid: anything)
+            .with(message: 'Skipped scan for advisory', source_xid: be_present, advisory_xid: be_present)
             .at_least(:once)
         end
       end