diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58f11e8db..f92b2767a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,10 @@ nav_order: 1
   private networks
 - Add `aiven_thanos` datasource field `thanos_user_config.privatelink_access`: Allow access to selected service components
   through Privatelink
+- Add `aiven_service_integration_endpoint` resource field `datadog_user_config.extra_tags_prefix`: Extra tags prefix.
+  Defaults to aiven.
+- Add `aiven_service_integration_endpoint` datasource field `datadog_user_config.extra_tags_prefix`: Extra tags prefix.
+  Defaults to aiven.
 
 ## [4.29.0] - 2024-11-14
 
diff --git a/docs/data-sources/service_integration_endpoint.md b/docs/data-sources/service_integration_endpoint.md
index 8687eb554..aeb0375e1 100644
--- a/docs/data-sources/service_integration_endpoint.md
+++ b/docs/data-sources/service_integration_endpoint.md
@@ -76,6 +76,7 @@ Read-Only:
 - `datadog_api_key` (String)
 - `datadog_tags` (List of Object) (see [below for nested schema](#nestedobjatt--datadog_user_config--datadog_tags))
 - `disable_consumer_stats` (Boolean)
+- `extra_tags_prefix` (String)
 - `kafka_consumer_check_instances` (Number)
 - `kafka_consumer_stats_timeout` (Number)
 - `max_partition_contexts` (Number)
diff --git a/docs/resources/service_integration_endpoint.md b/docs/resources/service_integration_endpoint.md
index 098135840..76d8001f6 100644
--- a/docs/resources/service_integration_endpoint.md
+++ b/docs/resources/service_integration_endpoint.md
@@ -105,6 +105,7 @@ Optional:
 
 - `datadog_tags` (Block List, Max: 32) Custom tags provided by user (see [below for nested schema](#nestedblock--datadog_user_config--datadog_tags))
 - `disable_consumer_stats` (Boolean) Disable consumer group metrics.
+- `extra_tags_prefix` (String) Extra tags prefix. Defaults to aiven.
 - `kafka_consumer_check_instances` (Number) Number of separate instances to fetch kafka consumer statistics with. Example: `8`.
 - `kafka_consumer_stats_timeout` (Number) Number of seconds that datadog will wait to get consumer statistics from brokers. Example: `60`.
 - `max_partition_contexts` (Number) Maximum number of partition contexts to send. Example: `32000`.
diff --git a/go.mod b/go.mod
index 4c2b49ec5..0c144db3a 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.23
 
 require (
 	github.com/aiven/aiven-go-client/v2 v2.32.0
-	github.com/aiven/go-client-codegen v0.56.0
+	github.com/aiven/go-client-codegen v0.62.0
 	github.com/avast/retry-go v3.0.0+incompatible
 	github.com/dave/jennifer v1.7.1
 	github.com/docker/go-units v0.5.0
@@ -60,7 +60,7 @@ require (
 	cloud.google.com/go v0.112.0 // indirect
 	cloud.google.com/go/storage v1.36.0 // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
-	github.com/aiven/go-api-schemas v1.103.0
+	github.com/aiven/go-api-schemas v1.104.0
 	github.com/aws/aws-sdk-go v1.44.122 // indirect
 	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
diff --git a/go.sum b/go.sum
index 24ad46d2f..8bbfd5299 100644
--- a/go.sum
+++ b/go.sum
@@ -197,10 +197,10 @@ github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7l
 github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
 github.com/aiven/aiven-go-client/v2 v2.32.0 h1:P7MeU33bhn+DvvNygViAzXVLfAztEZF0xYrGGX8wZ14=
 github.com/aiven/aiven-go-client/v2 v2.32.0/go.mod h1:IUEFZGRoerp3hLTLBuGQhas/HI3IAzRLwDq5D+VSk0g=
-github.com/aiven/go-api-schemas v1.103.0 h1:jz1/Nu/l26gQF46PhL12tNAQLd79wrpagSrbqVJgVZU=
-github.com/aiven/go-api-schemas v1.103.0/go.mod h1:gtyL4LloZ2lRqcyEZTCSizi1eKm6tdzQdUdlIHlvdlY=
-github.com/aiven/go-client-codegen v0.56.0 h1:LSaVaZV+Uw7jWJXfQui4NTzrhKWHRJUNtd4aCQforeY=
-github.com/aiven/go-client-codegen v0.56.0/go.mod h1:FfbH32Xb+Hx5zeKTIug1Y8SfMeB+AKNRzxgrzkts2oA=
+github.com/aiven/go-api-schemas v1.104.0 h1:RHhPLLnEXzcOwUlK7vZWcflzHcYK7LUF66koJiYbWVM=
+github.com/aiven/go-api-schemas v1.104.0/go.mod h1:z7dGvufm6If4gOdVr7dWTuFZmll9FOZr5Z5CSxGpebA=
+github.com/aiven/go-client-codegen v0.62.0 h1:h7sZMUagc1zQUb5l5LeIZ/S5B5aLfLqiYJA6/YI+ePY=
+github.com/aiven/go-client-codegen v0.62.0/go.mod h1:QKN/GgLMGWd6+gPEucXlZPi5vC3C6RpD3UeBRQOLI1Y=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM=
 github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk=
diff --git a/internal/sdkprovider/userconfig/serviceintegrationendpoint/datadog.go b/internal/sdkprovider/userconfig/serviceintegrationendpoint/datadog.go
index 7b992dd1a..e5934a8d3 100644
--- a/internal/sdkprovider/userconfig/serviceintegrationendpoint/datadog.go
+++ b/internal/sdkprovider/userconfig/serviceintegrationendpoint/datadog.go
@@ -43,6 +43,11 @@ func datadogUserConfig() *schema.Schema {
 				Optional:    true,
 				Type:        schema.TypeBool,
 			},
+			"extra_tags_prefix": {
+				Description: "Extra tags prefix. Defaults to aiven.",
+				Optional:    true,
+				Type:        schema.TypeString,
+			},
 			"kafka_consumer_check_instances": {
 				Description: "Number of separate instances to fetch kafka consumer statistics with. Example: `8`.",
 				Optional:    true,