diff --git a/docs/sources/reference/components/database_observability/database_observability.mysql.md b/docs/sources/reference/components/database_observability/database_observability.mysql.md
index 54f16e4863..0bac3379b2 100644
--- a/docs/sources/reference/components/database_observability/database_observability.mysql.md
+++ b/docs/sources/reference/components/database_observability/database_observability.mysql.md
@@ -18,6 +18,7 @@ labels:
 database_observability.mysql "<LABEL>" {
   data_source_name = <DATA_SOURCE_NAME>
   forward_to       = [<LOKI_RECEIVERS>]
+  targets          = "<TARGET_LIST>"
 }
 ```
 
@@ -139,9 +140,10 @@ The `aws` block supplies the [ARN](https://docs.aws.amazon.com/IAM/latest/UserGu
 ```alloy
 database_observability.mysql "orders_db" {
   data_source_name = "user:pass@tcp(mysql:3306)/"
-  forward_to       = [loki.write.logs_service.receiver]
+  forward_to       = [loki.relabel.orders_db.receiver]
+  targets          = prometheus.exporter.mysql.orders_db.targets
 
-  enable_collectors = ["query_samples"]
+  enable_collectors = ["query_samples", "explain_plans"]
 
   cloud_provider {
     aws {
@@ -150,9 +152,39 @@ database_observability.mysql "orders_db" {
   }
 }
 
-prometheus.scrape "orders_db" {
+prometheus.exporter.mysql "orders_db" {
+  data_source_name  = "user:pass@tcp(mysql:3306)/"
+  enable_collectors = ["perf_schema.eventsstatements"]
+}
+
+loki.relabel "orders_db" {
+  forward_to = [loki.write.logs_service.receiver]
+  rule {
+    target_label = "job"
+    replacement  = "integrations/db-o11y"
+  }
+  rule {
+    target_label = "instance"
+    replacement  = "orders_db"
+  }
+}
+
+discovery.relabel "orders_db" {
   targets = database_observability.mysql.orders_db.targets
-  honor_labels = true // required to keep job and instance labels
+
+  rule {
+    target_label = "job"
+    replacement  = "integrations/db-o11y"
+  }
+  rule {
+    target_label = "instance"
+    replacement  = "orders_db"
+  }
+}
+
+prometheus.scrape "orders_db" {
+  targets    = discovery.relabel.orders_db.targets
+  job_name   = "integrations/db-o11y"
   forward_to = [prometheus.remote_write.metrics_service.receiver]
 }
 
diff --git a/docs/sources/reference/components/database_observability/database_observability.postgres.md b/docs/sources/reference/components/database_observability/database_observability.postgres.md
index d7c6ddf126..452676b310 100644
--- a/docs/sources/reference/components/database_observability/database_observability.postgres.md
+++ b/docs/sources/reference/components/database_observability/database_observability.postgres.md
@@ -18,6 +18,7 @@ labels:
 database_observability.postgres "<LABEL>" {
   data_source_name = <DATA_SOURCE_NAME>
   forward_to       = [<LOKI_RECEIVERS>]
+  targets          = "<TARGET_LIST>"
 }
 ```
 
@@ -116,9 +117,11 @@ The `aws` block supplies the [ARN](https://docs.aws.amazon.com/IAM/latest/UserGu
 
 ```alloy
 database_observability.postgres "orders_db" {
-  data_source_name = "postgres://user:pass@localhost:5432/mydb"
-  forward_to = [loki.write.logs_service.receiver]
-  enable_collectors = ["query_details", "query_samples", "schema_details"]
+  data_source_name = "postgres://user:pass@localhost:5432/dbname"
+  forward_to       = [loki.relabel.orders_db.receiver]
+  targets          = prometheus.exporter.postgres.orders_db.targets
+
+  enable_collectors = ["query_samples", "explain_plans"]
 
   cloud_provider {
     aws {
@@ -127,9 +130,39 @@ database_observability.postgres "orders_db" {
   }
 }
 
-prometheus.scrape "orders_db" {
+prometheus.exporter.postgres "orders_db" {
+  data_source_name   = "postgres://user:pass@localhost:5432/dbname"
+  enabled_collectors = ["stat_statements"]
+}
+
+loki.relabel "orders_db" {
+  forward_to = [loki.write.logs_service.receiver]
+  rule {
+    target_label = "job"
+    replacement  = "integrations/db-o11y"
+  }
+  rule {
+    target_label = "instance"
+    replacement  = "orders_db"
+  }
+}
+
+discovery.relabel "orders_db" {
   targets = database_observability.postgres.orders_db.targets
-  honor_labels = true // required to keep job and instance labels
+
+  rule {
+    target_label = "job"
+    replacement  = "integrations/db-o11y"
+  }
+  rule {
+    target_label = "instance"
+    replacement  = "orders_db"
+  }
+}
+
+prometheus.scrape "orders_db" {
+  targets    = discovery.relabel.orders_db.targets
+  job_name   = "integrations/db-o11y"
   forward_to = [prometheus.remote_write.metrics_service.receiver]
 }
 
diff --git a/internal/component/database_observability/README.md b/internal/component/database_observability/README.md
index 5179f646fa..21fb4665af 100644
--- a/internal/component/database_observability/README.md
+++ b/internal/component/database_observability/README.md
@@ -158,7 +158,7 @@ local.file "mysql_secret_<your_DB_name>" {
 
 prometheus.exporter.mysql "integrations_mysqld_exporter_<your_DB_name>" {
   data_source_name  = local.file.mysql_secret_<your_DB_name>.content
-  enable_collectors = ["perf_schema.eventsstatements", "perf_schema.eventswaits"]
+  enable_collectors = ["perf_schema.eventsstatements"]
 }
 
 database_observability.mysql "mysql_<your_DB_name>" {
@@ -510,7 +510,7 @@ loki.relabel "database_observability_postgres_<your_DB_name>" {
 }
 
 discovery.relabel "database_observability_postgres_<your_DB_name>" {
-  targets = concat(prometheus.exporter.postgres.integrations_postgres_exporter_<your_DB_name>.targets, database_observability.postgres.postgres_<your_DB_name>.targets)
+  targets = database_observability.postgres.postgres_<your_DB_name>.targets
 
   rule {
     target_label = "job"
diff --git a/internal/component/database_observability/mysql/component.go b/internal/component/database_observability/mysql/component.go
index 33845e3cba..fe4514cdab 100644
--- a/internal/component/database_observability/mysql/component.go
+++ b/internal/component/database_observability/mysql/component.go
@@ -57,7 +57,7 @@ var (
 type Arguments struct {
 	DataSourceName                alloytypes.Secret   `alloy:"data_source_name,attr"`
 	ForwardTo                     []loki.LogsReceiver `alloy:"forward_to,attr"`
-	Targets                       []discovery.Target  `alloy:"targets,attr,optional"`
+	Targets                       []discovery.Target  `alloy:"targets,attr"`
 	EnableCollectors              []string            `alloy:"enable_collectors,attr,optional"`
 	DisableCollectors             []string            `alloy:"disable_collectors,attr,optional"`
 	AllowUpdatePerfSchemaSettings bool                `alloy:"allow_update_performance_schema_settings,attr,optional"`
diff --git a/internal/component/database_observability/mysql/component_test.go b/internal/component/database_observability/mysql/component_test.go
index 672dca47d5..ecfe147b34 100644
--- a/internal/component/database_observability/mysql/component_test.go
+++ b/internal/component/database_observability/mysql/component_test.go
@@ -24,13 +24,12 @@ import (
 	"github.com/grafana/loki/pkg/push"
 )
 
-func Test_collectSQLText(t *testing.T) {
+func Test_disableQueryRedaction(t *testing.T) {
 	t.Run("enable sql text when provided", func(t *testing.T) {
-		t.Parallel()
-
 		exampleDBO11yAlloyConfig := `
 		data_source_name = ""
 		forward_to = []
+		targets = []
 		query_samples {
 			disable_query_redaction = true
 		}
@@ -44,11 +43,10 @@ func Test_collectSQLText(t *testing.T) {
 	})
 
 	t.Run("disable sql text when not provided (default behavior)", func(t *testing.T) {
-		t.Parallel()
-
 		exampleDBO11yAlloyConfig := `
 		data_source_name = ""
 		forward_to = []
+		targets = []
 	`
 
 		var args Arguments
@@ -59,11 +57,10 @@ func Test_collectSQLText(t *testing.T) {
 	})
 
 	t.Run("setup consumers scrape interval is correctly parsed from config", func(t *testing.T) {
-		t.Parallel()
-
 		exampleDBO11yAlloyConfig := `
 		data_source_name = ""
 		forward_to = []
+		targets = []
 		setup_consumers {
 			collect_interval = "1h"
 		}
@@ -79,11 +76,10 @@ func Test_collectSQLText(t *testing.T) {
 
 func Test_parseCloudProvider(t *testing.T) {
 	t.Run("parse cloud provider block", func(t *testing.T) {
-		t.Parallel()
-
 		exampleDBO11yAlloyConfig := `
 		data_source_name = ""
 		forward_to = []
+		targets = []
 		cloud_provider {
 			aws {
 				arn = "arn:aws:rds:some-region:some-account:db:some-db-instance"
@@ -98,11 +94,10 @@ func Test_parseCloudProvider(t *testing.T) {
 		assert.Equal(t, "arn:aws:rds:some-region:some-account:db:some-db-instance", args.CloudProvider.AWS.ARN)
 	})
 	t.Run("empty cloud provider block", func(t *testing.T) {
-		t.Parallel()
-
 		exampleDBO11yAlloyConfig := `
 		data_source_name = ""
 		forward_to = []
+		targets = []
 	`
 
 		var args Arguments
@@ -118,6 +113,7 @@ func Test_enableOrDisableCollectors(t *testing.T) {
 		exampleDBO11yAlloyConfig := `
 		data_source_name = ""
 		forward_to = []
+		targets = []
 	`
 
 		var args Arguments
@@ -140,6 +136,7 @@ func Test_enableOrDisableCollectors(t *testing.T) {
 		exampleDBO11yAlloyConfig := `
 		data_source_name = ""
 		forward_to = []
+		targets = []
 		enable_collectors = ["query_details", "schema_details", "query_samples", "setup_consumers", "explain_plans", "locks"]
 	`
 
@@ -163,6 +160,7 @@ func Test_enableOrDisableCollectors(t *testing.T) {
 		exampleDBO11yAlloyConfig := `
 		data_source_name = ""
 		forward_to = []
+		targets = []
 		disable_collectors = ["query_details", "schema_details", "query_samples", "setup_consumers", "explain_plans"]
 	`
 
@@ -186,6 +184,7 @@ func Test_enableOrDisableCollectors(t *testing.T) {
 		exampleDBO11yAlloyConfig := `
 		data_source_name = ""
 		forward_to = []
+		targets = []
 		disable_collectors = ["query_details", "schema_details", "query_samples", "setup_consumers", "explain_plans", "locks"]
 		enable_collectors = ["query_details", "schema_details", "query_samples", "setup_consumers", "explain_plans", "locks"]
 	`
@@ -210,6 +209,7 @@ func Test_enableOrDisableCollectors(t *testing.T) {
 		exampleDBO11yAlloyConfig := `
 		data_source_name = ""
 		forward_to = []
+		targets = []
 		disable_collectors = ["schema_details", "query_samples", "setup_consumers", "explain_plans", "locks"]
 		enable_collectors = ["query_details"]
 	`
@@ -234,6 +234,7 @@ func Test_enableOrDisableCollectors(t *testing.T) {
 		exampleDBO11yAlloyConfig := `
 		data_source_name = ""
 		forward_to = []
+		targets = []
 		enable_collectors = ["some_string"]
 		disable_collectors = ["another_string"]
 	`
@@ -288,8 +289,6 @@ func Test_addLokiLabels(t *testing.T) {
 // TestMySQL_Update_DBUnavailable_ReportsUnhealthy tests that the component does not return an error when the database is unavailable,
 // but reports unhealthy with the error message from the database.
 func TestMySQL_Update_DBUnavailable_ReportsUnhealthy(t *testing.T) {
-	t.Parallel()
-
 	args := Arguments{DataSourceName: "user:pass@tcp(127.0.0.1:1)/db"}
 	opts := cmp.Options{
 		ID:     "test.mysql",
@@ -308,8 +307,6 @@ func TestMySQL_Update_DBUnavailable_ReportsUnhealthy(t *testing.T) {
 // TestMySQL_StartCollectors_ReportsUnhealthy_StackedErrors tests that the component tries to start collectors on a best effort basis,
 // reports unhealthy stacking errors for the collectors that failed to start and generate metrics for the collectors that started successfully.
 func TestMySQL_StartCollectors_ReportsUnhealthy_StackedErrors(t *testing.T) {
-	t.Parallel()
-
 	args := Arguments{
 		DataSourceName:    "user:pass@tcp(127.0.0.1:3306)/db",
 		DisableCollectors: []string{"query_details", "schema_details", "setup_consumers", "explain_plans"},
diff --git a/internal/component/database_observability/postgres/component.go b/internal/component/database_observability/postgres/component.go
index 37ce30cf6f..ed0692dc73 100644
--- a/internal/component/database_observability/postgres/component.go
+++ b/internal/component/database_observability/postgres/component.go
@@ -64,7 +64,7 @@ var (
 type Arguments struct {
 	DataSourceName    alloytypes.Secret   `alloy:"data_source_name,attr"`
 	ForwardTo         []loki.LogsReceiver `alloy:"forward_to,attr"`
-	Targets           []discovery.Target  `alloy:"targets,attr,optional"`
+	Targets           []discovery.Target  `alloy:"targets,attr"`
 	EnableCollectors  []string            `alloy:"enable_collectors,attr,optional"`
 	DisableCollectors []string            `alloy:"disable_collectors,attr,optional"`
 
diff --git a/internal/component/database_observability/postgres/component_test.go b/internal/component/database_observability/postgres/component_test.go
index cac9921035..f569ee07eb 100644
--- a/internal/component/database_observability/postgres/component_test.go
+++ b/internal/component/database_observability/postgres/component_test.go
@@ -24,6 +24,7 @@ func Test_enableOrDisableCollectors(t *testing.T) {
 		exampleDBO11yAlloyConfig := `
 		data_source_name = "postgres://db"
 		forward_to = []
+		targets = []
 	`
 
 		var args Arguments
@@ -44,6 +45,7 @@ func Test_enableOrDisableCollectors(t *testing.T) {
 		exampleDBO11yAlloyConfig := `
 		data_source_name = "postgres://db"
 		forward_to = []
+		targets = []
 		enable_collectors = ["query_details"]
 	`
 
@@ -65,6 +67,7 @@ func Test_enableOrDisableCollectors(t *testing.T) {
 		exampleDBO11yAlloyConfig := `
 		data_source_name = "postgres://db"
 		forward_to = []
+		targets = []
 		disable_collectors = ["query_details"]
 	`
 
@@ -86,6 +89,7 @@ func Test_enableOrDisableCollectors(t *testing.T) {
 		exampleDBO11yAlloyConfig := `
 		data_source_name = "postgres://db"
 		forward_to = []
+		targets = []
 		disable_collectors = ["query_details"]
 		enable_collectors = ["query_details"]
 	`
@@ -108,6 +112,7 @@ func Test_enableOrDisableCollectors(t *testing.T) {
 		exampleDBO11yAlloyConfig := `
 		data_source_name = "postgres://db"
 		forward_to = []
+		targets = []
 		enable_collectors = ["some_string"]
 		disable_collectors = ["another_string"]
 	`
@@ -130,6 +135,7 @@ func Test_enableOrDisableCollectors(t *testing.T) {
 		exampleDBO11yAlloyConfig := `
 		data_source_name = "postgres://db"
 		forward_to = []
+		targets = []
 		enable_collectors = ["query_samples"]
 	`
 
@@ -151,6 +157,7 @@ func Test_enableOrDisableCollectors(t *testing.T) {
 		exampleDBO11yAlloyConfig := `
 		data_source_name = "postgres://db"
 		forward_to = []
+		targets = []
 		enable_collectors = ["schema_details"]
 	`
 
@@ -172,6 +179,7 @@ func Test_enableOrDisableCollectors(t *testing.T) {
 		exampleDBO11yAlloyConfig := `
 		data_source_name = "postgres://db"
 		forward_to = []
+		targets = []
 		enable_collectors = ["query_details", "query_samples"]
 	`
 
@@ -193,6 +201,7 @@ func Test_enableOrDisableCollectors(t *testing.T) {
 		exampleDBO11yAlloyConfig := `
 		data_source_name = "postgres://db"
 		forward_to = []
+		targets = []
 		disable_collectors = ["query_samples"]
 	`
 
@@ -216,6 +225,7 @@ func TestQueryRedactionConfig(t *testing.T) {
 		exampleDBO11yAlloyConfig := `
 		data_source_name = "postgres://db"
 		forward_to = []
+		targets = []
 		enable_collectors = ["query_samples"]
 	`
 
@@ -229,6 +239,7 @@ func TestQueryRedactionConfig(t *testing.T) {
 		exampleDBO11yAlloyConfig := `
 		data_source_name = "postgres://db"
 		forward_to = []
+		targets = []
 		enable_collectors = ["query_samples"]
 		query_samples {
 			disable_query_redaction = true
@@ -245,6 +256,7 @@ func TestQueryRedactionConfig(t *testing.T) {
 		exampleDBO11yAlloyConfig := `
 		data_source_name = "postgres://db"
 		forward_to = []
+		targets = []
 		enable_collectors = ["query_samples"]
 		query_samples {
 			disable_query_redaction = false
@@ -263,6 +275,7 @@ func TestCollectionIntervals(t *testing.T) {
 		exampleDBO11yAlloyConfig := `
 		data_source_name = "postgres://db"
 		forward_to = []
+		targets = []
 		`
 
 		var args Arguments
@@ -275,6 +288,7 @@ func TestCollectionIntervals(t *testing.T) {
 		exampleDBO11yAlloyConfig := `
 		data_source_name = "postgres://db"
 		forward_to = []
+		targets = []
 		query_samples {
 			collect_interval = "5s"
 		}
@@ -318,8 +332,6 @@ func Test_addLokiLabels(t *testing.T) {
 }
 
 func TestPostgres_Update_DBUnavailable_ReportsUnhealthy(t *testing.T) {
-	t.Parallel()
-
 	args := Arguments{DataSourceName: "postgres://127.0.0.1:1/db?sslmode=disable"}
 	opts := cmp.Options{
 		ID:     "test.postgres",
@@ -337,11 +349,10 @@ func TestPostgres_Update_DBUnavailable_ReportsUnhealthy(t *testing.T) {
 }
 
 func TestPostgres_schema_details_collect_interval_is_parsed_from_config(t *testing.T) {
-	t.Parallel()
-
 	exampleDBO11yAlloyConfig := `
 	data_source_name = "postgres://db"
 	forward_to = []
+	targets = []
 	schema_details {
 		collect_interval = "11s"
 	}
@@ -359,6 +370,7 @@ func TestPostgres_schema_details_cache_configuration_is_parsed_from_config(t *te
 		exampleDBO11yAlloyConfig := `
 		data_source_name = "postgres://db"
 		forward_to = []
+		targets = []
 		`
 
 		var args Arguments
@@ -374,6 +386,7 @@ func TestPostgres_schema_details_cache_configuration_is_parsed_from_config(t *te
 		exampleDBO11yAlloyConfig := `
 		data_source_name = "postgres://db"
 		forward_to = []
+		targets = []
 		schema_details {
 			collect_interval = "30s"
 			cache_enabled = false