diff --git a/.github/workflows/continouos-integration.yml b/.github/workflows/continouos-integration.yml
index abf3f2a8..5f2e26cc 100644
--- a/.github/workflows/continouos-integration.yml
+++ b/.github/workflows/continouos-integration.yml
@@ -72,15 +72,22 @@ jobs:
   build:
     name: Build & Analyze
     if: "(github.event.release || github.event.release.prerelease) == false"
+    continue-on-error: ${{ matrix.experimental }}
     needs: [ lint, checkstyle ]
     runs-on: ubuntu-latest
 
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         distribution: [ 'corretto' ]
         jdk: [ '11' ]
         scala: [ '2.13.8' ]
+        experimental: [false]
+        include:
+          - jdk: '17'
+            distribution: 'corretto'
+            scala: '2.13.8'
+            experimental: true
 
     steps:
       - name: Checkout repository
@@ -108,7 +115,7 @@ jobs:
     needs: [ build ]
 
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         distribution: [ 'corretto' ]
         jdk: [ '11' ]
diff --git a/build.sbt b/build.sbt
index 702a0885..5d43a110 100644
--- a/build.sbt
+++ b/build.sbt
@@ -18,7 +18,7 @@ lazy val root = (project in file("."))
 Compile / doc / sources := Seq.empty
 routesGenerator := InjectedRoutesGenerator
 
-crossScalaVersions := Seq("2.13.5")
+crossScalaVersions := Seq("2.13.8")
 
 // Checkstyle config.
 checkstyleSeverityLevel := Some(CheckstyleSeverityLevel.Info)