diff --git a/scripts/generate-sdk/generate-sdk.sh b/scripts/generate-sdk/generate-sdk.sh
index 34a2b65..1d80d17 100755
--- a/scripts/generate-sdk/generate-sdk.sh
+++ b/scripts/generate-sdk/generate-sdk.sh
@@ -24,7 +24,6 @@ fi
 
 cleanup() {
     rm -rf ${sdk_services_backup_dir}
-    go env -w GOPRIVATE=${goprivate_backup}
 }
 
 if type -p java >/dev/null; then
@@ -75,10 +74,6 @@ git clone ${SDK_REPO_URL} ${SDK_REPO_LOCAL_PATH}
 cd ${SDK_REPO_LOCAL_PATH}
 make project-tools
 
-# Set GOPRIVATE to download the SDK Go module
-goprivate_backup=$(go env GOPRIVATE)
-go env -w GOPRIVATE="github.com/stackitcloud"
-
 # Save and remove SDK services/
 cp -a "${SDK_REPO_LOCAL_PATH}/services/." ${sdk_services_backup_dir}
 rm -rf ${SDK_REPO_LOCAL_PATH}/services
@@ -160,3 +155,4 @@ done
 # Cleanup after SDK generation
 cd ${SDK_REPO_LOCAL_PATH}
 goimports -w ${SDK_REPO_LOCAL_PATH}/services/
+make sync-tidy