diff --git a/.github/workflows/samples-spring.yaml b/.github/workflows/samples-spring.yaml
new file mode 100644
index 000000000000..d266c3584821
--- /dev/null
+++ b/.github/workflows/samples-spring.yaml
@@ -0,0 +1,59 @@
+name: Samples Java Spring
+
+on:
+  push:
+    paths:
+      - 'samples/server/petstore/spring*/**'
+      - 'samples/openapi3/server/petstore/spring*/**'
+  pull_request:
+    paths:
+      - 'samples/server/petstore/spring*/**'
+      - 'samples/openapi3/server/petstore/spring*/**'
+jobs:
+  build:
+    name: Build Java Spring
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          # clients
+          - samples/client/petstore/spring-cloud
+          - samples/openapi3/client/petstore/spring-cloud
+          - samples/client/petstore/spring-cloud-date-time
+          - samples/openapi3/client/petstore/spring-cloud-date-time
+          - samples/client/petstore/spring-stubs
+          - samples/openapi3/client/petstore/spring-stubs
+          # servers
+          - samples/server/petstore/spring-mvc
+          - samples/server/petstore/spring-mvc-default-value
+          - samples/server/petstore/spring-mvc-j8-async
+          - samples/server/petstore/spring-mvc-j8-localdatetime
+          - samples/server/petstore/springboot
+          - samples/openapi3/server/petstore/springboot
+          - samples/server/petstore/springboot-beanvalidation
+          - samples/server/petstore/springboot-useoptional
+          - samples/openapi3/server/petstore/springboot-useoptional
+          - samples/server/petstore/springboot-reactive
+          - samples/openapi3/server/petstore/springboot-reactive
+          - samples/server/petstore/springboot-implicitHeaders
+          - samples/openapi3/server/petstore/springboot-implicitHeaders
+          - samples/server/petstore/springboot-delegate
+          - samples/openapi3/server/petstore/springboot-delegate
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: 8
+      - name: Cache maven dependencies
+        uses: actions/cache@v2.1.7
+        env:
+          cache-name: maven-repository
+        with:
+          path: |
+            ~/.m2
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+      - name: Build
+        working-directory: ${{ matrix.sample }}
+        run: mvn clean package
diff --git a/pom.xml b/pom.xml
index 332c899e1ad7..9618190ac097 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1261,27 +1261,6 @@
             <modules>
                 <!-- clients -->
                 <module>samples/client/petstore/spring-cloud</module>
-                <module>samples/openapi3/client/petstore/spring-cloud</module>
-                <module>samples/client/petstore/spring-cloud-date-time</module>
-                <module>samples/openapi3/client/petstore/spring-cloud-date-time</module>
-                <module>samples/client/petstore/spring-stubs</module>
-                <module>samples/openapi3/client/petstore/spring-stubs</module>
-                <!-- servers -->
-                <module>samples/server/petstore/spring-mvc</module>
-                <module>samples/server/petstore/spring-mvc-default-value</module>
-                <module>samples/server/petstore/spring-mvc-j8-async</module>
-                <module>samples/server/petstore/spring-mvc-j8-localdatetime</module>
-                <module>samples/server/petstore/springboot</module>
-                <module>samples/openapi3/server/petstore/springboot</module>
-                <module>samples/server/petstore/springboot-beanvalidation</module>
-                <module>samples/server/petstore/springboot-useoptional</module>
-                <module>samples/openapi3/server/petstore/springboot-useoptional</module>
-                <module>samples/server/petstore/springboot-reactive</module>
-                <module>samples/openapi3/server/petstore/springboot-reactive</module>
-                <module>samples/server/petstore/springboot-implicitHeaders</module>
-                <module>samples/openapi3/server/petstore/springboot-implicitHeaders</module>
-                <module>samples/server/petstore/springboot-delegate</module>
-                <module>samples/openapi3/server/petstore/springboot-delegate</module>
             </modules>
         </profile>
         <!-- node 3 tests in CircleCI -->