diff --git a/internal/packages/assets.go b/internal/packages/assets.go
index d05c3943fe..2ed2ec6ad6 100644
--- a/internal/packages/assets.go
+++ b/internal/packages/assets.go
@@ -135,9 +135,14 @@ func loadElasticsearchAssets(pkgRootPath string) ([]Asset, error) {
 				continue // ingest pipeline is not defined
 			}
 
+			// If no dataset value is set in the manifest, it falls back to {packageName}.{dirName}
+			if dsManifest.Dataset == "" {
+				dsManifest.Dataset = fmt.Sprintf("%s.%s", pkgManifest.Name, dsManifest.Name)
+			}
+
 			ingestPipelineName := dsManifest.GetPipelineNameOrDefault()
 			if ingestPipelineName == defaultPipelineName {
-				ingestPipelineName = fmt.Sprintf("%s-%s.%s-%s", dsManifest.Type, pkgManifest.Name, dsManifest.Name, pkgManifest.Version)
+				ingestPipelineName = fmt.Sprintf("%s-%s-%s", dsManifest.Type, dsManifest.Dataset, pkgManifest.Version)
 			}
 			asset = Asset{
 				ID:         ingestPipelineName,
diff --git a/test/packages/parallel/awsfirehose/data_stream/log/manifest.yml b/test/packages/parallel/awsfirehose/data_stream/log/manifest.yml
index 7bf7532a5c..b9128b556a 100644
--- a/test/packages/parallel/awsfirehose/data_stream/log/manifest.yml
+++ b/test/packages/parallel/awsfirehose/data_stream/log/manifest.yml
@@ -1,6 +1,6 @@
 title: Logs from Amazon Kinesis Data Firehose
 type: logs
-dataset: awsfirehose.log
+dataset: awsfirehose
 # Ensures agents have permissions to write data to `logs-*-*`
 elasticsearch:
   dynamic_dataset: true