diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 89e56586211..a413c3455cb 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -23,15 +23,6 @@ jobs:
         go-version: [1.19, "1.20"]
     steps:
     - uses: actions/checkout@v2
-      with:
-        path: aws-sdk-go-v2
-
-    - name: Checkout smithy-go
-      uses: actions/checkout@v2
-      with:
-        repository: aws/smithy-go
-        path: smithy-go
-        ref: ep20
 
     - name: Set up Go
       uses: actions/setup-go@v2
@@ -42,7 +33,7 @@ jobs:
       run: go install golang.org/x/lint/golint@latest
 
     - name: Test
-      run: cd aws-sdk-go-v2 && make gen-mod-replace-smithy-. ci-test-no-generate
+      run: make ci-test-no-generate
 
   deprecated-unix-tests:
     needs: unix-tests
@@ -59,15 +50,6 @@ jobs:
             go-version: 1.16
     steps:
     - uses: actions/checkout@v2
-      with:
-        path: aws-sdk-go-v2
-
-    - name: Checkout smithy-go
-      uses: actions/checkout@v2
-      with:
-        repository: aws/smithy-go
-        path: smithy-go
-        ref: ep20
 
     - name: Set up Go
       uses: actions/setup-go@v2
@@ -75,7 +57,7 @@ jobs:
         go-version: ${{ matrix.go-version }}
 
     - name: Test
-      run: cd aws-sdk-go-v2 && make gen-mod-replace-smithy-. ci-test-no-generate
+      run: make ci-test-no-generate
 
   windows-tests:
     name: Windows SDK Tests
@@ -86,18 +68,8 @@ jobs:
         go-version: [1.19, "1.20"]
     env:
       EACHMODULE_SKIP: "internal\\repotools\\changes"
-      SMITHY_GO_SRC: ${{ github.workspace }}/smithy-go
     steps:
     - uses: actions/checkout@v2
-      with:
-        path: aws-sdk-go-v2
-
-    - name: Checkout smithy-go
-      uses: actions/checkout@v2
-      with:
-        repository: aws/smithy-go
-        path: smithy-go
-        ref: ep20
 
     - name: Set up Go
       uses: actions/setup-go@v2
@@ -105,7 +77,7 @@ jobs:
         go-version: ${{ matrix.go-version }}
 
     - name: Test
-      run: cd aws-sdk-go-v2 && make gen-mod-replace-smithy-. vet build unit-test
+      run: make vet build unit-test
 
   deprecated-windows-tests:
     needs: windows-tests
@@ -117,18 +89,8 @@ jobs:
         go-version: [1.15, 1.16, 1.17, 1.18]
     env:
       EACHMODULE_SKIP: "internal\\repotools\\changes"
-      SMITHY_GO_SRC: ${{ github.workspace }}/smithy-go
     steps:
     - uses: actions/checkout@v2
-      with:
-        path: aws-sdk-go-v2
-
-    - name: Checkout smithy-go
-      uses: actions/checkout@v2
-      with:
-        repository: aws/smithy-go
-        path: smithy-go
-        ref: ep20
 
     - name: Set up Go
       uses: actions/setup-go@v2
@@ -136,4 +98,4 @@ jobs:
         go-version: ${{ matrix.go-version }}
 
     - name: Test
-      run: cd aws-sdk-go-v2 && make gen-mod-replace-smithy-. vet build unit-test
+      run: make vet build unit-test
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index d9f888f009b..97340fde32c 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -15,18 +15,8 @@ jobs:
         os: [ubuntu-latest]  # other options: macos-latest, windows-latest
     steps:
       - uses: actions/checkout@v2
-        with:
-          path: aws-sdk-go-v2
-
-      - name: Checkout smithy-go
-        uses: actions/checkout@v2
-        with:
-          repository: aws/smithy-go
-          path: smithy-go
-          ref: ep20
-
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v2
         with:
           # Required: the version of golangci-lint is required and must be
           # specified without patch version
@@ -36,6 +26,5 @@ jobs:
           args: --version
           # Show only new issues if it's a pull request. The default value is `false`.
           # only-new-issues: true
-
       - name: run ci linter
-        run: cd aws-sdk-go-v2 && make gen-mod-replace-smithy-. ci-lint
+        run: make ci-lint