diff --git a/.circleci/template.sh b/.circleci/template.sh
index b3f867435..927020ff1 100644
--- a/.circleci/template.sh
+++ b/.circleci/template.sh
@@ -1,5 +1,3 @@
 #!/usr/bin/env bash
 export CIRCLECI_TEMPLATE=java-library-oss
 export JDK=17
-export UNIT_TEST_11=true
-export UNIT_TEST_15=true
diff --git a/build.gradle b/build.gradle
index 7b268660e..ce8faedf1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,6 +26,7 @@ apply plugin: 'com.palantir.external-publish'
 apply plugin: 'com.palantir.git-version'
 apply plugin: 'com.palantir.baseline'
 apply plugin: 'com.palantir.consistent-versions'
+apply plugin: 'com.palantir.baseline-java-versions'
 
 version System.env.CIRCLE_TAG ?: gitVersion()
 
@@ -43,8 +44,6 @@ subprojects {
     apply plugin: 'java-library'
     apply plugin: 'org.inferred.processors'
 
-    sourceCompatibility = 11
-    targetCompatibility = 11
 
     tasks.withType(Checkstyle) {
         enabled = false
@@ -89,3 +88,7 @@ idea.project.ipr.withXml { xml ->
     </component>
     '''))
 }
+
+javaVersions {
+    libraryTarget = 11
+}