diff --git a/languages/golang/templates/api.mustache b/languages/golang/templates/api.mustache
index e2f7592..a41750e 100644
--- a/languages/golang/templates/api.mustache
+++ b/languages/golang/templates/api.mustache
@@ -1,4 +1,4 @@
-{{! This template was customized to use the GenericOpenAPIError from the core module. See https://github.com/OpenAPITools/openapi-generator/blob/v7.24.0/modules/openapi-generator/src/main/resources/go/api.mustache for the original template }}
+{{! This template was customized to use the GenericOpenAPIError from the core module. See https://github.com/OpenAPITools/openapi-generator/blob/v7.25.0/modules/openapi-generator/src/main/resources/go/api.mustache for the original template }}
 {{>partial_header}}
 package {{packageName}}
 
diff --git a/languages/golang/templates/client.mustache b/languages/golang/templates/client.mustache
index 468df5d..e9f0ecf 100644
--- a/languages/golang/templates/client.mustache
+++ b/languages/golang/templates/client.mustache
@@ -1,4 +1,4 @@
-{{! This template was customized to support the custom configuration options from the core module. See https://github.com/OpenAPITools/openapi-generator/blob/v7.24.0/modules/openapi-generator/src/main/resources/go/client.mustache for the original template }}
+{{! This template was customized to support the custom configuration options from the core module. See https://github.com/OpenAPITools/openapi-generator/blob/v7.25.0/modules/openapi-generator/src/main/resources/go/client.mustache for the original template }}
 {{>partial_header}}
 package {{packageName}}
 
diff --git a/languages/golang/templates/configuration.mustache b/languages/golang/templates/configuration.mustache
index b295d2d..1ed712c 100644
--- a/languages/golang/templates/configuration.mustache
+++ b/languages/golang/templates/configuration.mustache
@@ -1,4 +1,4 @@
-{{! This template was ENTIRELY overwritten to support the custom configuration type and options from the STACKIT SDK core module. See https://github.com/OpenAPITools/openapi-generator/blob/v7.24.0/modules/openapi-generator/src/main/resources/go/configuration.mustache for the original template }}
+{{! This template was ENTIRELY overwritten to support the custom configuration type and options from the STACKIT SDK core module. See https://github.com/OpenAPITools/openapi-generator/blob/v7.25.0/modules/openapi-generator/src/main/resources/go/configuration.mustache for the original template }}
 {{>partial_header}}
 package {{packageName}}
 
diff --git a/scripts/generate-sdk/generate-sdk.sh b/scripts/generate-sdk/generate-sdk.sh
index 8c0adef..88e028f 100755
--- a/scripts/generate-sdk/generate-sdk.sh
+++ b/scripts/generate-sdk/generate-sdk.sh
@@ -68,7 +68,7 @@ case "${LANGUAGE}" in
 go)
 # When the GENERATOR_VERSION changes, migrate also the templates in templates/go
 # Renovate: datasource=github-tags depName=OpenAPITools/openapi-generator versioning=semver
-    GENERATOR_VERSION="v7.24.0"
+    GENERATOR_VERSION="v7.25.0"
     ;;
 python)
 # When the GENERATOR_VERSION changes, migrate also the templates in templates/python
diff --git a/scripts/generators/overrides/go/iaas/v1api/v1api_model_area_id.go b/scripts/generators/overrides/go/iaas/v1api/v1api_model_area_id.go
index 0e7c6b6..64f8b7d 100644
--- a/scripts/generators/overrides/go/iaas/v1api/v1api_model_area_id.go
+++ b/scripts/generators/overrides/go/iaas/v1api/v1api_model_area_id.go
@@ -45,7 +45,7 @@ func (dst *AreaId) UnmarshalJSON(data []byte) error {
 	err = json.Unmarshal(data, &dst.StaticAreaID)
 	if err == nil {
 		jsonStaticAreaID, _ := json.Marshal(dst.StaticAreaID)
-         // OVERRIDE: added expr after ||
+		// OVERRIDE: added expr after ||
 		if string(jsonStaticAreaID) == "{}" || *dst.StaticAreaID == STATICAREAID_UNKNOWN_DEFAULT_OPEN_API { // empty struct or unknown fallback enum
 			dst.StaticAreaID = nil
 		} else {
@@ -82,9 +82,9 @@ func (dst *AreaId) UnmarshalJSON(data []byte) error {
 	} else { // no match
 		if err != nil {
 			return fmt.Errorf("data failed to match schemas in oneOf(AreaId): %v", err)
-		} else {
-			return fmt.Errorf("data failed to match schemas in oneOf(AreaId)")
 		}
+
+		return fmt.Errorf("data failed to match schemas in oneOf(AreaId)")
 	}
 }
 
diff --git a/scripts/generators/overrides/go/iaas/v2api/v2api_model_area_id.go b/scripts/generators/overrides/go/iaas/v2api/v2api_model_area_id.go
index 08b1ace..08df52f 100644
--- a/scripts/generators/overrides/go/iaas/v2api/v2api_model_area_id.go
+++ b/scripts/generators/overrides/go/iaas/v2api/v2api_model_area_id.go
@@ -45,7 +45,7 @@ func (dst *AreaId) UnmarshalJSON(data []byte) error {
 	err = json.Unmarshal(data, &dst.StaticAreaID)
 	if err == nil {
 		jsonStaticAreaID, _ := json.Marshal(dst.StaticAreaID)
-         // OVERRIDE: added expr after ||
+		// OVERRIDE: added expr after ||
 		if string(jsonStaticAreaID) == "{}" || *dst.StaticAreaID == STATICAREAID_UNKNOWN_DEFAULT_OPEN_API { // empty struct or unknown fallback enum
 			dst.StaticAreaID = nil
 		} else {
@@ -82,9 +82,9 @@ func (dst *AreaId) UnmarshalJSON(data []byte) error {
 	} else { // no match
 		if err != nil {
 			return fmt.Errorf("data failed to match schemas in oneOf(AreaId): %v", err)
-		} else {
-			return fmt.Errorf("data failed to match schemas in oneOf(AreaId)")
 		}
+
+		return fmt.Errorf("data failed to match schemas in oneOf(AreaId)")
 	}
 }
 
diff --git a/scripts/generators/overrides/go/iaas/v2beta1api/v2beta_model_area_id.go b/scripts/generators/overrides/go/iaas/v2beta1api/v2beta_model_area_id.go
index 811da9a..ae6aaf3 100644
--- a/scripts/generators/overrides/go/iaas/v2beta1api/v2beta_model_area_id.go
+++ b/scripts/generators/overrides/go/iaas/v2beta1api/v2beta_model_area_id.go
@@ -45,7 +45,7 @@ func (dst *AreaId) UnmarshalJSON(data []byte) error {
 	err = json.Unmarshal(data, &dst.StaticAreaID)
 	if err == nil {
 		jsonStaticAreaID, _ := json.Marshal(dst.StaticAreaID)
-         // OVERRIDE: added expr after ||
+		// OVERRIDE: added expr after ||
 		if string(jsonStaticAreaID) == "{}" || *dst.StaticAreaID == STATICAREAID_UNKNOWN_DEFAULT_OPEN_API { // empty struct or unknown fallback enum
 			dst.StaticAreaID = nil
 		} else {
@@ -82,9 +82,9 @@ func (dst *AreaId) UnmarshalJSON(data []byte) error {
 	} else { // no match
 		if err != nil {
 			return fmt.Errorf("data failed to match schemas in oneOf(AreaId): %v", err)
-		} else {
-			return fmt.Errorf("data failed to match schemas in oneOf(AreaId)")
 		}
+
+		return fmt.Errorf("data failed to match schemas in oneOf(AreaId)")
 	}
 }
 
diff --git a/scripts/generators/overrides/go/overrides.properties b/scripts/generators/overrides/go/overrides.properties
index 88c812b..0bf7b4e 100644
--- a/scripts/generators/overrides/go/overrides.properties
+++ b/scripts/generators/overrides/go/overrides.properties
@@ -1,11 +1,11 @@
 iaasV2ApiAreaId.path=iaas/v2api/model_area_id.go
 iaasV2ApiAreaId.replacementPath=iaas/v2api/v2api_model_area_id.go
-iaasV2ApiAreaId.hash=fd8a0426a8aefa66a10e7bb81c1cceba
+iaasV2ApiAreaId.hash=a97d25f94a504e19c6b988dd4029ea0c
 
 iaasV1ApiAreaId.path=iaas/v1api/model_area_id.go
 iaasV1ApiAreaId.replacementPath=iaas/v1api/v1api_model_area_id.go
-iaasV1ApiAreaId.hash=b5626b52f7d93e9e9e26d679075d7031
+iaasV1ApiAreaId.hash=0eefcbcb557da69c63de54138dcee90a
 
 iaasV2BetaApiAreaId.path=iaas/v2beta1api/model_area_id.go
 iaasV2BetaApiAreaId.replacementPath=iaas/v2beta1api/v2beta_model_area_id.go
-iaasV2BetaApiAreaId.hash=0e4f740cefba5981258cf15ecd995246
+iaasV2BetaApiAreaId.hash=f9943d639bdb4c0c804e233ef8eaa64a