diff --git a/codegen/gradle/wrapper/gradle-wrapper.jar b/codegen/gradle/wrapper/gradle-wrapper.jar
index 9bbc975c742b..1b33c55baabb 100644
Binary files a/codegen/gradle/wrapper/gradle-wrapper.jar and b/codegen/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/codegen/gradle/wrapper/gradle-wrapper.properties b/codegen/gradle/wrapper/gradle-wrapper.properties
index d4081da476bb..2a84e188b85a 100644
--- a/codegen/gradle/wrapper/gradle-wrapper.properties
+++ b/codegen/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/codegen/gradlew b/codegen/gradlew
index faf93008b77e..23d15a936707 100755
--- a/codegen/gradlew
+++ b/codegen/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/codegen/gradlew.bat b/codegen/gradlew.bat
index 9b42019c7915..5eed7ee84528 100644
--- a/codegen/gradlew.bat
+++ b/codegen/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/codegen/sdk-codegen/build.gradle.kts b/codegen/sdk-codegen/build.gradle.kts
index 81f6ab3bf933..e58f49c4f940 100644
--- a/codegen/sdk-codegen/build.gradle.kts
+++ b/codegen/sdk-codegen/build.gradle.kts
@@ -72,11 +72,12 @@ val buildSdk = tasks.register<SmithyBuildTask>("buildSdk") {
 // JSON file found in aws-models/. The generated smithy-build.json file is
 // not committed to git since it's rebuilt each time codegen is performed.
 val generateSmithyBuild = tasks.register("generate-smithy-build") {
+    val clientNameProp: String? by project
+    val modelsDirProp: String by project
+    val models = project.file(modelsDirProp);
+
     doLast {
         val projectionsBuilder = Node.objectNodeBuilder()
-        val modelsDirProp: String by project
-        val clientNameProp: String? by project
-        val models = project.file(modelsDirProp);
 
         fileTree(models).filter { it.isFile }.files.forEach eachFile@{ file ->
             val model = Model.assembler()
diff --git a/codegen/smithy-aws-typescript-codegen/build.gradle.kts b/codegen/smithy-aws-typescript-codegen/build.gradle.kts
index e71dd155f085..53f8b5bf86b9 100644
--- a/codegen/smithy-aws-typescript-codegen/build.gradle.kts
+++ b/codegen/smithy-aws-typescript-codegen/build.gradle.kts
@@ -52,6 +52,9 @@ dependencies {
 }
 
 tasks.register("set-aws-sdk-versions") {
+    val packagesDir = project.file("../../packages")
+    val clientsDir = project.file("../../clients")
+
     doLast {
         mkdir(layout.buildDirectory.dir("generated/resources/software/amazon/smithy/aws/typescript/codegen").get().asFile)
         var versionsFile = layout.buildDirectory
@@ -60,7 +63,7 @@ tasks.register("set-aws-sdk-versions") {
             .asFile
         versionsFile.printWriter().close()
 
-        var roots = project.file("../../packages").listFiles().toMutableList() + project.file("../../clients").listFiles().toList()
+        var roots = packagesDir.listFiles().toMutableList() + clientsDir.listFiles().toList()
         roots.forEach { packageDir ->
             var packageJsonFile = File(packageDir, "package.json")
             if (packageJsonFile.isFile()) {
diff --git a/scripts/generate-clients/config.js b/scripts/generate-clients/config.js
index 387a1d94973f..6d26a2107002 100644
--- a/scripts/generate-clients/config.js
+++ b/scripts/generate-clients/config.js
@@ -1,7 +1,7 @@
 // Update this commit when taking up new changes from smithy-typescript.
 module.exports = {
   // Use full commit hash as we explicitly fetch it.
-  SMITHY_TS_COMMIT: "43bec3331c9b9e5e00ce3a8113fea58fba8c59d7",
+  SMITHY_TS_COMMIT: "ceb0a0d05333af401a18a98428b0072c401ef241",
 };
 
 if (module.exports.SMITHY_TS_COMMIT.length < 40) {