diff --git a/.github/workflows/automation-regenerate-go-sdk.yaml b/.github/workflows/automation-regenerate-go-sdk.yaml
index 46adffa7f6e..9ecfd002a40 100644
--- a/.github/workflows/automation-regenerate-go-sdk.yaml
+++ b/.github/workflows/automation-regenerate-go-sdk.yaml
@@ -33,6 +33,8 @@ jobs:
         run: |
           cd ./data
           make build
+          cd ../tools/data-api
+          make build
 
       - name: "Launch SSH Agent"
         run: |
diff --git a/scripts/automation-generate-and-commit-go-sdk.sh b/scripts/automation-generate-and-commit-go-sdk.sh
index 84273ad5f4d..2e4195d15c5 100755
--- a/scripts/automation-generate-and-commit-go-sdk.sh
+++ b/scripts/automation-generate-and-commit-go-sdk.sh
@@ -115,7 +115,7 @@ function main {
   local outputDirectory="tmp/go-azure-sdk"
   local sdkRepo="git@github.com:hashicorp/go-azure-sdk.git"
   local sha
-  local useV2Generator=false
+  local useV2Generator=true
 
   buildAndInstallDependencies
   sha=$(getSwaggerSubmoduleSha "$swaggerSubmodule")