diff --git a/wpilibcExamples/src/main/cpp/examples/examples.json b/wpilibcExamples/src/main/cpp/examples/examples.json
index df3e3cc313..1a7925c10e 100644
--- a/wpilibcExamples/src/main/cpp/examples/examples.json
+++ b/wpilibcExamples/src/main/cpp/examples/examples.json
@@ -316,7 +316,7 @@
       "PID"
     ],
     "foldername": "Frisbeebot",
-    "mainclass": "Main"
+    "gradlebase": "cpp"
   },
   {
     "name": "Gyro Drive Commands",
@@ -327,7 +327,7 @@
       "Gyro"
     ],
     "foldername": "GyroDriveCommands",
-    "mainclass": "Main"
+    "gradlebase": "cpp"
   },
   {
     "name": "SwerveBot",
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json
index 0e5d67a614..3452f93732 100644
--- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json
+++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json
@@ -291,6 +291,7 @@
       "Command-based"
     ],
     "foldername": "hatchbottraditional",
+    "gradlebase": "java",
     "mainclass": "Main"
   },
   {
@@ -302,6 +303,7 @@
       "Lambdas"
     ],
     "foldername": "hatchbotinlined",
+    "gradlebase": "java",
     "mainclass": "Main"
   },
   {
@@ -311,6 +313,7 @@
       "Command-based"
     ],
     "foldername": "selectcommand",
+    "gradlebase": "java",
     "mainclass": "Main"
   },
   {
@@ -321,6 +324,7 @@
       "Shuffleboard"
     ],
     "foldername": "schedulereventlogging",
+    "gradlebase": "java",
     "mainclass": "Main"
   },
   {
@@ -331,6 +335,7 @@
       "PID"
     ],
     "foldername": "frisbeebot",
+    "gradlebase": "java",
     "mainclass": "Main"
   },
   {
@@ -342,6 +347,7 @@
       "Gyro"
     ],
     "foldername": "gyrodrivecommands",
+    "gradlebase": "java",
     "mainclass": "Main"
   },
   {