diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml
index b417aae678..f3e515447d 100644
--- a/.ci/azure-pipelines.yml
+++ b/.ci/azure-pipelines.yml
@@ -55,3 +55,6 @@ jobs:
 
 - ${{ if or(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'), startsWith(variables['Build.SourceBranch'], 'refs/heads/master')) }}:
   - template: azure-pipelines-package.yml
+
+- ${{ if or(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'), startsWith(variables['Build.SourceBranch'], 'refs/heads/master')) }}:
+    - template: azure-pipelines-api-client.yml
diff --git a/apiclient/templates/typescript/stable.sh b/apiclient/templates/typescript/stable.sh
index 46af6433f4..f23a85cc96 100644
--- a/apiclient/templates/typescript/stable.sh
+++ b/apiclient/templates/typescript/stable.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 CLIENT=$1
-openapi-generator generate \
+java -jar openapi-generator-cli.jar generate \
     --input-spec $(System.ArtifactsDirectory)/openapi/openapi.json \
     --generator-name typescript-${CLIENT} \
     --output ./apiclient/generated/typescript/${CLIENT}  \
diff --git a/apiclient/templates/typescript/unstable.sh b/apiclient/templates/typescript/unstable.sh
index 255e20c4fc..3571c8ad5c 100644
--- a/apiclient/templates/typescript/unstable.sh
+++ b/apiclient/templates/typescript/unstable.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 CLIENT=$1
-openapi-generator generate \
+java -jar openapi-generator-cli.jar generate \
     --input-spec $(System.ArtifactsDirectory)/openapi/openapi.json \
     --generator-name typescript-${CLIENT} \
     --output ./apiclient/generated/typescript/${CLIENT}  \