diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 7038eba..6718d4e 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,5 +4,18 @@
     directory: /
     schedule:
       interval: daily
-
-# TODO - add maven dependabot if community agrees it's useful
\ No newline at end of file
+  
+  - package-ecosystem: maven
+    directory: /
+    schedule:
+      interval: daily
+  
+  - package-ecosystem: maven
+    directory: /yasson-jmh
+    schedule:
+      interval: weekly
+  
+  - package-ecosystem: maven
+    directory: /yasson-tck
+    schedule:
+      interval: weekly
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3c9ef81..755f38e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
         <jakarta.parson.version>1.1.9</jakarta.parson.version>
 
         <!-- Test dependencies-->
-        <junit-jupiter.version>5.14.4</junit-jupiter.version> <!-- TODO update to Junit 6 when running on Java 17+ -->
+        <junit-jupiter.version>6.1.1</junit-jupiter.version>
         <weld-se-core.version>6.0.4.Final</weld-se-core.version>
 
         <!--Plugins-->
diff --git a/yasson-jmh/pom.xml b/yasson-jmh/pom.xml
index 3a60057..c871ba3 100644
--- a/yasson-jmh/pom.xml
+++ b/yasson-jmh/pom.xml
@@ -19,7 +19,7 @@
     </description>
 
     <properties>
-        <jmh.version>1.21</jmh.version>
+        <jmh.version>1.37</jmh.version>
         <yasson.version>${project.version}</yasson.version>
     </properties>
 
diff --git a/yasson-tck/pom.xml b/yasson-tck/pom.xml
index 43d06c8..af09f8a 100644
--- a/yasson-tck/pom.xml
+++ b/yasson-tck/pom.xml
@@ -31,14 +31,14 @@
         <yasson.version>${project.version}</yasson.version>
 
         <!-- Test Versions -->
-        <junit-jupiter.version>5.14.4</junit-jupiter.version> <!-- TODO update to Junit 6 when running on Java 17+ -->  
+        <junit-jupiter.version>6.1.1</junit-jupiter.version>
         <weld-se-core.version>6.0.4.Final</weld-se-core.version>
-        <arquillian-junit5-container.version>1.8.0.Final</arquillian-junit5-container.version>
+        <arquillian-junit5-container.version>1.10.2.Final</arquillian-junit5-container.version>
 
         <!-- Plugin Versions -->
-        <maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
-        <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
-        <maven-surefire-report-plugin.version>3.2.5</maven-surefire-report-plugin.version>
+        <maven-dependency-plugin.version>3.11.0</maven-dependency-plugin.version>
+        <maven-surefire-plugin.version>3.5.6</maven-surefire-plugin.version>
+        <maven-surefire-report-plugin.version>3.5.6</maven-surefire-report-plugin.version>
     </properties>
 
     <dependencies>