diff --git a/.github/workflows/generic-client-tests.yml b/.github/workflows/generic-client-tests.yml
index 3fdcd6258df67..e11c44d31bf6c 100644
--- a/.github/workflows/generic-client-tests.yml
+++ b/.github/workflows/generic-client-tests.yml
@@ -30,17 +30,8 @@ jobs:
           cd ..
 
       - name: build codegen and generate generic client
-        run: |
-          cd codegen
-          ./gradlew clean smithy-aws-typescript-codegen:build generic-client-test-codegen:build
-
-      - name: build service-client-documentation-generator
-        run: |
-          cd packages/service-client-documentation-generator
-          yarn install && yarn build
+        run: yarn && yarn generate:clients:generic
 
       - name: build generic client
         run: |
-          cd codegen/generic-client-test-codegen/build/smithyprojections/generic-client-test-codegen/aws-echo-service/typescript-codegen/
-          sed -i -e 's/"@aws-sdk\/service-client-documentation-generator":\ "3\.37\.0"/"@aws-sdk\/service-client-documentation-generator":\ "..\/..\/..\/..\/..\/..\/..\/packages\/service-client-documentation-generator"/g' package.json
-          yarn install && yarn build
+          yarn build:clients:generic
diff --git a/package.json b/package.json
index f3976dd574766..41907197e2c82 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "clear-build-cache": "rimraf ./packages/*/dist ./clients/*/dist ./lib/*/dist ./private/*/dist",
     "clear-build-info": "rimraf ./packages/**/*.tsbuildinfo ./clients/**/*.tsbuildinfo  ./lib/**/*.tsbuildinfo ./private/**/*.tsbuildinfo",
     "remove-documentation": "rimraf ./docs",
+    "build:clients:generic": "lerna run --scope '@aws-sdk/aws-echo-service' --include-dependencies build",
     "build:crypto-dependencies": "lerna run --scope '@aws-sdk/{types,util-utf8-browser,util-locate-window,hash-node}' --include-dependencies build",
     "build:protocols": "yarn build:crypto-dependencies && lerna run --scope '@aws-sdk/aws-protocoltests-*' --include-dependencies build",
     "build:server-protocols": "yarn build:crypto-dependencies && lerna run --scope '@aws-sdk/*-server' --include-dependencies build",