diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 1e8c712..76d91eb 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,11 +3,11 @@
   "isRoot": true,
   "tools": {
     "microsoft.openapi.kiota": {
-      "version": "1.17.0",
+      "version": "1.18.0-preview.202408290001",
       "commands": [
         "kiota"
       ],
       "rollForward": false
     }
   }
-}
\ No newline at end of file
+}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 86c59c9..8180c47 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,12 +22,8 @@ jobs:
       - uses: actions/checkout@v4
       - name: Tool restore
         run: dotnet tool restore
-      - uses: ./.github/actions/build-kiota
-        id: kiota
       - name: Restore
         run: dotnet restore --nologo
-        env:
-          KIOTA_BIN: ${{ steps.kiota.outputs.command }}
       - name: Build
         run: dotnet build --no-restore --nologo --configuration Release
       - name: Test
diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
index a882dec..c6f1222 100644
--- a/.github/workflows/nightly-release.yml
+++ b/.github/workflows/nightly-release.yml
@@ -21,12 +21,8 @@ jobs:
         run: git fetch --prune --unshallow
       - name: Tool restore
         run: dotnet tool restore
-      - uses: ./.github/actions/build-kiota
-        id: kiota
       - name: Restore
         run: dotnet restore --nologo
-        env:
-          KIOTA_BIN: ${{ steps.kiota.outputs.command }}
       - uses: ./.github/actions/version
         id: version
       - name: Build with .Net
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index c7b1e1f..cc5bcf7 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -22,12 +22,8 @@ jobs:
       - uses: actions/checkout@v4
       - name: Tool restore
         run: dotnet tool restore
-      - uses: ./.github/actions/build-kiota
-        id: kiota
       - name: Restore
         run: dotnet restore --nologo
-        env:
-          KIOTA_BIN: ${{ steps.kiota.outputs.command }}
       - name: Build
         run: dotnet build --no-restore --nologo --configuration Release
       - name: Test
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ce9e130..8f61d27 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,12 +26,8 @@ jobs:
           echo "NuGetPreReleaseTagV2 (not used): ${{ steps.gitversion.outputs.CommitsSinceVersionSourcePadded }}"
       - name: Tool restore
         run: dotnet tool restore
-      - uses: ./.github/actions/build-kiota
-        id: kiota
       - name: Restore
         run: dotnet restore --nologo
-        env:
-          KIOTA_BIN: ${{ steps.kiota.outputs.command }}
       - uses: ./.github/actions/version
         id: version
       - name: Build with .Net
diff --git a/src/Apple.AppStoreConnect/Apple.AppStoreConnect.csproj b/src/Apple.AppStoreConnect/Apple.AppStoreConnect.csproj
index 26139da..962b705 100644
--- a/src/Apple.AppStoreConnect/Apple.AppStoreConnect.csproj
+++ b/src/Apple.AppStoreConnect/Apple.AppStoreConnect.csproj
@@ -51,7 +51,7 @@
     <KiotaCommand>$(KIOTA_BIN)</KiotaCommand>
     <KiotaCommand Condition=" '$(KiotaCommand)' == '' ">dotnet kiota</KiotaCommand>
 
-    <KiotaExec>KIOTA_TUTORIAL_ENABLED=false $(KiotaCommand) generate</KiotaExec>
+    <KiotaExec>$(KiotaCommand) generate</KiotaExec>
     <KiotaExec>$(KiotaExec) --openapi $(MSBuildProjectDirectory)/$(AppStoreConnectOpenApiSpecificationExtracted)/$(AppStoreConnectOpenApiSpecificationJson)</KiotaExec>
     <KiotaExec>$(KiotaExec) --language csharp</KiotaExec>
     <KiotaExec>$(KiotaExec) --exclude-backward-compatible</KiotaExec>
@@ -91,7 +91,7 @@
   <Target Name="GenerateClient" BeforeTargets="Restore;_GenerateRestoreProjectSpec" AfterTargets="PreprocessOpenApiSpecification" Condition=" $(GenerateClient) == 'true' And !Exists('$(MSBuildProjectDirectory)/$(GeneratedCodeTarget)')">
     <Message Importance="High" Text="Generating client to the $(MSBuildProjectDirectory)/$(GeneratedCodeTarget) using $(KiotaCommand)" />
 
-    <Exec WorkingDirectory="$(ProjectDir)" Command="$(KiotaExec)" />
+    <Exec WorkingDirectory="$(ProjectDir)" EnvironmentVariables="KIOTA_TUTORIAL_ENABLED=false" Command="$(KiotaExec)" />
   </Target>
 
 </Project>