diff --git a/changelog/@unreleased/pr-2389.v2.yml b/changelog/@unreleased/pr-2389.v2.yml
new file mode 100644
index 000000000..4835ac181
--- /dev/null
+++ b/changelog/@unreleased/pr-2389.v2.yml
@@ -0,0 +1,5 @@
+type: fix
+fix:
+  description: Roll back nullaway+checkerframework for jdk15 support
+  links:
+  - https://github.com/palantir/gradle-baseline/pull/2389
diff --git a/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineNullAwayIntegrationTest.groovy b/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineNullAwayIntegrationTest.groovy
index bc9e65457..6fd8a9a0f 100644
--- a/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineNullAwayIntegrationTest.groovy
+++ b/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineNullAwayIntegrationTest.groovy
@@ -85,4 +85,24 @@ class BaselineNullAwayIntegrationTest extends AbstractPluginTest {
         BuildResult result = with('compileJava').build()
         result.task(":compileJava").outcome == TaskOutcome.SUCCESS
     }
+
+    def 'compileJava succeeds when null-away finds no errors on jdk15'() {
+        when:
+        buildFile << standardBuildFile.replace('libraryTarget = 17', 'libraryTarget = 15')
+        file('src/main/java/com/palantir/test/Test.java') << validJavaFile
+
+        then:
+        BuildResult result = with('compileJava').build()
+        result.task(":compileJava").outcome == TaskOutcome.SUCCESS
+    }
+
+    def 'compileJava succeeds when null-away finds no errors on jdk11'() {
+        when:
+        buildFile << standardBuildFile.replace('libraryTarget = 17', 'libraryTarget = 11')
+        file('src/main/java/com/palantir/test/Test.java') << validJavaFile
+
+        then:
+        BuildResult result = with('compileJava').build()
+        result.task(":compileJava").outcome == TaskOutcome.SUCCESS
+    }
 }
diff --git a/versions.lock b/versions.lock
index ef15d0e26..7feb6a954 100644
--- a/versions.lock
+++ b/versions.lock
@@ -40,7 +40,7 @@ com.palantir.javaformat:palantir-java-format-spi:1.1.0 (1 constraints: 711560be)
 com.palantir.safe-logging:preconditions:3.0.0 (6 constraints: 76574831)
 com.palantir.safe-logging:safe-logging:3.0.0 (8 constraints: 8777131f)
 com.palantir.tritium:tritium-registry:0.50.0 (1 constraints: 3705333b)
-com.uber.nullaway:nullaway:0.10.1 (1 constraints: 3405243b)
+com.uber.nullaway:nullaway:0.9.9 (1 constraints: 14050f36)
 commons-io:commons-io:2.11.0 (2 constraints: 1426005d)
 commons-lang:commons-lang:2.6 (1 constraints: ac04232c)
 io.dropwizard.metrics:metrics-core:4.1.1 (1 constraints: 901088a5)
@@ -69,9 +69,9 @@ org.apache.maven.resolver:maven-resolver-util:1.6.3 (3 constraints: 5930fd65)
 org.apache.maven.shared:maven-dependency-analyzer:1.12.0 (1 constraints: 36052f3b)
 org.apache.maven.shared:maven-shared-utils:3.3.4 (1 constraints: e60b61f3)
 org.assertj:assertj-core:3.23.1 (3 constraints: e42af49e)
-org.checkerframework:checker-qual:3.25.0 (3 constraints: 08256088)
-org.checkerframework:dataflow-errorprone:3.25.0 (4 constraints: fc3da85d)
-org.checkerframework:dataflow-nullaway:3.25.0 (2 constraints: 6911b8f1)
+org.checkerframework:checker-qual:3.23.0 (3 constraints: 08256088)
+org.checkerframework:dataflow-errorprone:3.23.0 (4 constraints: fa3d685c)
+org.checkerframework:dataflow-nullaway:3.23.0 (2 constraints: 671166f1)
 org.codehaus.groovy:groovy:3.0.10 (3 constraints: e32879d6)
 org.codehaus.groovy:groovy-xml:3.0.10 (1 constraints: 791161da)
 org.codehaus.plexus:plexus-cipher:2.0 (1 constraints: 641174c7)
diff --git a/versions.props b/versions.props
index f738a4182..15dbdb8ce 100644
--- a/versions.props
+++ b/versions.props
@@ -3,11 +3,11 @@ com.google.auto.service:auto-service = 1.0.1
 com.google.errorprone:error_prone_* = 2.15.0
 com.google.guava:guava = 31.1-jre
 com.palantir.safe-logging:* = 3.0.0
-com.uber.nullaway:nullaway = 0.10.1
+com.uber.nullaway:nullaway = 0.9.9
 commons-lang:commons-lang = 2.6
 org.apache.maven.shared:maven-dependency-analyzer = 1.12.0
 org.apache.maven:maven-core = 3.8.5
-org.checkerframework:* = 3.25.0
+org.checkerframework:* = 3.23.0
 org.inferred:freebuilder = 1.14.6
 org.jooq:jooq = 3.17.2
 org.slf4j:* = 1.7.36