diff --git a/scripts/generate-sdk/languages/go.sh b/scripts/generate-sdk/languages/go.sh
index 11824132..9d465e72 100644
--- a/scripts/generate-sdk/languages/go.sh
+++ b/scripts/generate-sdk/languages/go.sh
@@ -178,6 +178,7 @@ generate_go_sdk() {
                 --git-repo-id "${GIT_REPO_ID}/services/${service}" \
                 --global-property apis,models,modelTests=true,modelDocs=false,apiDocs=false,supportingFiles,apiTests=false\
                 --inline-schema-options "SKIP_SCHEMA_REUSE=true,RESOLVE_INLINE_ENUMS=true" \
+                --openapi-normalizer "SIMPLIFY_ONEOF_ANYOF=false" \
                 --http-user-agent "stackit-sdk-go/${service}" \
                 --reserved-words-mappings type=types \
                 --config "${ROOT_DIR}/languages/golang/openapi-generator-config.yml"
@@ -191,6 +192,12 @@ generate_go_sdk() {
                 echo "Found ${service} \"wait\" package"
                 cp -r "${sdk_services_backup_dir}/${service}/${version}api/wait" "${SERVICES_FOLDER}/${service}/${version}api/wait"
             fi
+
+            # If the service version has a handwritten.go file, move them inside the service folder
+            if [ -f "${sdk_services_backup_dir}/${service}/${version}api/handwritten.go" ]; then
+                echo "Found ${service} \"handwritten.go\" file"
+                cp -r "${sdk_services_backup_dir}/${service}/${version}api/handwritten.go" "${SERVICES_FOLDER}/${service}/${version}api/handwritten.go"
+            fi
         done
         
         if ! grep -E "^$service$" "${ROOT_DIR}/languages/golang/compat-layer/allow-list.txt"; then
diff --git a/scripts/generate-sdk/languages/java.sh b/scripts/generate-sdk/languages/java.sh
index e46e0357..1d4ddc17 100644
--- a/scripts/generate-sdk/languages/java.sh
+++ b/scripts/generate-sdk/languages/java.sh
@@ -147,6 +147,7 @@ generate_java_sdk() {
                 --additional-properties="artifactId=${service},artifactDescription=${SERVICE_DESCRIPTION},invokerPackage=cloud.stackit.sdk.${service}.${version}api,modelPackage=cloud.stackit.sdk.${service}.${version}api.model,apiPackage=cloud.stackit.sdk.${service}.${version}api.api,serviceName=${service_pascal_case}" \
                 --inline-schema-options "SKIP_SCHEMA_REUSE=true" \
                 --http-user-agent stackit-sdk-java/"${service}" \
+                --openapi-normalizer "SIMPLIFY_ONEOF_ANYOF=false" \
                 --config "${ROOT_DIR}/languages/java/openapi-generator-config.yml"
 
             # Rename DefaultApiServiceApi.java to {serviceName}Api.java
diff --git a/scripts/generate-sdk/languages/python.sh b/scripts/generate-sdk/languages/python.sh
index 4e738df2..b00f4a2a 100644
--- a/scripts/generate-sdk/languages/python.sh
+++ b/scripts/generate-sdk/languages/python.sh
@@ -124,6 +124,7 @@ generate_python_sdk() {
             --git-host "${GIT_HOST}" \
             --git-user-id "${GIT_USER_ID}" \
             --git-repo-id "${GIT_REPO_ID}" \
+            --openapi-normalizer "SIMPLIFY_ONEOF_ANYOF=false" \
             --global-property apis,models,modelTests=false,modelDocs=false,apiDocs=false,apiTests=false,supportingFiles \
             --additional-properties=pythonPackageName="stackit-${service},removeEnumValuePrefix=false,${extra_props_internal}" >/dev/null \
             --http-user-agent "stackit-sdk-python/${service}"