diff --git a/.github/workflows/feature.yml b/.github/workflows/feature.yml
new file mode 100644
index 0000000..1e240cb
--- /dev/null
+++ b/.github/workflows/feature.yml
@@ -0,0 +1,26 @@
+name: Build
+on:
+    push:
+        branches-ignore:
+            - master
+
+concurrency:
+    group: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+    build:
+        runs-on:
+            labels: ubuntu-latest
+        timeout-minutes: 30
+        steps:
+            - uses: actions/checkout@v4
+            - name: Set up JDK 21
+              uses: actions/setup-java@v4
+              with:
+                  java-version: 21
+                  distribution: liberica
+            - name: Setup Gradle
+              uses: gradle/actions/setup-gradle@v4
+            - name: Build
+              run: |
+                  ./gradlew build --info --stacktrace
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
new file mode 100644
index 0000000..1fcba15
--- /dev/null
+++ b/.github/workflows/master.yml
@@ -0,0 +1,25 @@
+name: Build Android libraries + example client and run android emulator tests
+on:
+  push:
+    branches:
+      - master
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: temurin
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Build
+        run: |
+          ./gradlew build --info --stacktrace
diff --git a/.gitignore b/.gitignore
index 641dcb3..d08c9d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,4 +68,4 @@ crashlytics.properties
 crashlytics-build.properties
 fabric.properties
 Contact GitHub API Training Shop Blog About
-
+.profileconfig.json
diff --git a/build.gradle b/build.gradle
index 24faad1..5abb5cc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'me.champeau.jmh' version '0.7.3' apply false
     id 'com.github.ben-manes.versions' version '0.52.0' apply false
-    id 'org.owasp.dependencycheck' version '12.1.3' apply false
     id 'io.morethan.jmhreport' version '0.9.6' apply false
 }
 
@@ -13,7 +12,7 @@ ext {
     jmhVersion = '1.37'
     oktaVersion = '0.5.12'
     fusionAuthVersion = '5.3.3'
-    junitJupiterVersion = '5.13.1'
+    junitJupiterVersion = '5.13.4'
     jaxbVersion = '2.3.1'
     bouncyCastleVersion = '1.81'
     jose4jVersion = '0.9.6'
@@ -31,22 +30,22 @@ configure(libraryProjects()) {
     apply plugin: 'java-library'
 
     test {
-        useJUnitPlatform {
-
-        }
+        useJUnitPlatform()
         forkEvery = 1
     }
 
     dependencies {
-        testImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
-        testImplementation "org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}"
+        testImplementation(platform("org.junit:junit-bom:${junitJupiterVersion}"))
+        testImplementation "org.junit.jupiter:junit-jupiter-api"
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+        testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+        testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
     }
 
 }
 
 configure(buildProjects()) {
     apply plugin: 'com.github.ben-manes.versions'
-    apply plugin: 'org.owasp.dependencycheck'
 
     repositories {
         mavenLocal()