diff --git a/.github/workflows/samples-go.yaml b/.github/workflows/samples-go.yaml
new file mode 100644
index 000000000000..a46a7ea9c22f
--- /dev/null
+++ b/.github/workflows/samples-go.yaml
@@ -0,0 +1,36 @@
+name: Samples Go 
+
+on:
+  push:
+    paths:
+      - 'samples/server/petstore/go-echo-server/**'
+      - 'samples/server/petstore/go-api-server/**'
+  pull_request:
+    paths:
+      - 'samples/server/petstore/go-echo-server/**'
+      - 'samples/server/petstore/go-api-server/**'
+
+jobs:
+  build:
+    name: Build Go 
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          - samples/server/petstore/go-echo-server/
+          - samples/server/petstore/go-api-server/
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '>=1.17.0'
+      - run: go version
+      - name: Install
+        working-directory: ${{ matrix.sample }}
+        run: |
+          go get github.com/labstack/echo/v4/middleware@v4.9.0
+          go get github.com/labstack/echo/v4@v4.9.0
+      - name: Build
+        working-directory: ${{ matrix.sample }}
+        run: go test -v
diff --git a/modules/openapi-generator/src/main/resources/go-echo-server/go-mod.mustache b/modules/openapi-generator/src/main/resources/go-echo-server/go-mod.mustache
index 4b31aa41c83c..c1a4ac15ecee 100644
--- a/modules/openapi-generator/src/main/resources/go-echo-server/go-mod.mustache
+++ b/modules/openapi-generator/src/main/resources/go-echo-server/go-mod.mustache
@@ -2,4 +2,4 @@ module github.com/{{{gitUserId}}}/{{{gitRepoId}}}
 
 go 1.16
 
-require github.com/labstack/echo/v4 v4.2.0
+require github.com/labstack/echo/v4 v4.9.0
diff --git a/pom.xml b/pom.xml
index 7ca26d656a77..fea1d15a1c79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1333,10 +1333,8 @@
                 <!-- test Go projects -->
                 <module>samples/client/petstore/go</module>
                 <module>samples/openapi3/client/petstore/go</module>
-                <module>samples/server/petstore/go-api-server</module>
                 <!-- comment out due to Go version
                 <module>samples/server/petstore/go-gin-api-server</module>-->
-                <module>samples/server/petstore/go-echo-server</module>
             </modules>
         </profile>
         <profile>
diff --git a/samples/server/petstore/go-echo-server/go.mod b/samples/server/petstore/go-echo-server/go.mod
index a7d3a57f6197..586002dcc6ce 100644
--- a/samples/server/petstore/go-echo-server/go.mod
+++ b/samples/server/petstore/go-echo-server/go.mod
@@ -2,4 +2,4 @@ module github.com/GIT_USER_ID/GIT_REPO_ID
 
 go 1.16
 
-require github.com/labstack/echo/v4 v4.2.0
+require github.com/labstack/echo/v4 v4.9.0