diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 9a15f03..06623a4 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -80,7 +80,7 @@ jobs:
       
       - name: Remove waiters
         working-directory: ./sdk-repo-updated
-        run: rm -r services/*/wait
+        run: find ./services -type d -name "wait" -exec rm -r {} +
       
       - name: Install SDK project tools and dependencies 
         working-directory: ./sdk-repo-updated
diff --git a/scripts/generate-sdk/languages/go.sh b/scripts/generate-sdk/languages/go.sh
index f840f1e..fc38206 100644
--- a/scripts/generate-sdk/languages/go.sh
+++ b/scripts/generate-sdk/languages/go.sh
@@ -171,7 +171,7 @@ generate_go_sdk() {
                 --git-user-id "${GIT_USER_ID}" \
                 --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" \
+                --inline-schema-options "SKIP_SCHEMA_REUSE=true,RESOLVE_INLINE_ENUMS=true" \
                 --http-user-agent "stackit-sdk-go/${service}" \
                 --reserved-words-mappings type=types \
                 --config "${ROOT_DIR}/languages/golang/openapi-generator-config.yml"