diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 058895c2b77d..32310fe3288c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -196,7 +196,8 @@ jobs:
       - name: Error Prone Checks
         run: |
           export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
-          $MAVEN ${MAVEN_TEST} -T 1C clean verify -DskipTests ${MAVEN_GIB} -Dgib.buildUpstream=never -P errorprone-compiler \
+          # Skip checks, these are run in `maven-checks` job and e.g. checkstyle is expensive.
+          $MAVEN ${MAVEN_TEST} -T 1C clean verify -DskipTests -Dair.check.skip-all=true ${MAVEN_GIB} -Dgib.buildUpstream=never -P errorprone-compiler \
             -pl '!:trino-docs,!:trino-server,!:trino-server-rpm'
 
   web-ui-checks:
diff --git a/core/trino-main/src/main/java/io/trino/execution/QueryManagerConfig.java b/core/trino-main/src/main/java/io/trino/execution/QueryManagerConfig.java
index bd7cce16ea7f..9c1b04acf059 100644
--- a/core/trino-main/src/main/java/io/trino/execution/QueryManagerConfig.java
+++ b/core/trino-main/src/main/java/io/trino/execution/QueryManagerConfig.java
@@ -625,7 +625,6 @@ public QueryManagerConfig setRetryMaxDelay(Duration retryMaxDelay)
         return this;
     }
 
-    @NotNull
     public double getRetryDelayScaleFactor()
     {
         return retryDelayScaleFactor;
diff --git a/core/trino-main/src/main/java/io/trino/execution/TaskManagerConfig.java b/core/trino-main/src/main/java/io/trino/execution/TaskManagerConfig.java
index afe81df5ea99..6ee8964a6476 100644
--- a/core/trino-main/src/main/java/io/trino/execution/TaskManagerConfig.java
+++ b/core/trino-main/src/main/java/io/trino/execution/TaskManagerConfig.java
@@ -251,7 +251,6 @@ public TaskManagerConfig setMaxIndexMemoryUsage(DataSize maxIndexMemoryUsage)
         return this;
     }
 
-    @NotNull
     public boolean isShareIndexLoading()
     {
         return shareIndexLoading;
diff --git a/core/trino-main/src/main/java/io/trino/memory/MemoryManagerConfig.java b/core/trino-main/src/main/java/io/trino/memory/MemoryManagerConfig.java
index 54c775693b47..6af6954341c6 100644
--- a/core/trino-main/src/main/java/io/trino/memory/MemoryManagerConfig.java
+++ b/core/trino-main/src/main/java/io/trino/memory/MemoryManagerConfig.java
@@ -106,7 +106,6 @@ public MemoryManagerConfig setFaultTolerantExecutionTaskMemory(DataSize faultTol
         return this;
     }
 
-    @NotNull
     public double getFaultTolerantExecutionTaskMemoryGrowthFactor()
     {
         return faultTolerantExecutionTaskMemoryGrowthFactor;
@@ -121,7 +120,6 @@ public MemoryManagerConfig setFaultTolerantExecutionTaskMemoryGrowthFactor(doubl
         return this;
     }
 
-    @NotNull
     public double getFaultTolerantExecutionTaskMemoryEstimationQuantile()
     {
         return faultTolerantExecutionTaskMemoryEstimationQuantile;
diff --git a/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureFileSystemConfig.java b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureFileSystemConfig.java
index d2c8f5981625..2425974233ce 100644
--- a/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureFileSystemConfig.java
+++ b/lib/trino-filesystem-azure/src/main/java/io/trino/filesystem/azure/AzureFileSystemConfig.java
@@ -73,7 +73,6 @@ public AzureFileSystemConfig setWriteBlockSize(DataSize writeBlockSize)
         return this;
     }
 
-    @NotNull
     public int getMaxWriteConcurrency()
     {
         return maxWriteConcurrency;
diff --git a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/conf/AccumuloConfig.java b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/conf/AccumuloConfig.java
index 753322d36802..0535c8792b01 100644
--- a/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/conf/AccumuloConfig.java
+++ b/plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/conf/AccumuloConfig.java
@@ -114,7 +114,6 @@ public AccumuloConfig setZkMetadataRoot(String zkMetadataRoot)
         return this;
     }
 
-    @NotNull
     @Min(1)
     public int getCardinalityCacheSize()
     {
diff --git a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchConfig.java b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchConfig.java
index 339dd233e6af..59f1c0052485 100644
--- a/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchConfig.java
+++ b/plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchConfig.java
@@ -117,7 +117,6 @@ public ElasticsearchConfig setDefaultSchema(String defaultSchema)
         return this;
     }
 
-    @NotNull
     @Min(1)
     public int getScrollSize()
     {
@@ -239,7 +238,6 @@ public ElasticsearchConfig setMaxHttpConnections(int size)
         return this;
     }
 
-    @NotNull
     public int getMaxHttpConnections()
     {
         return maxHttpConnections;
@@ -253,7 +251,6 @@ public ElasticsearchConfig setHttpThreadCount(int count)
         return this;
     }
 
-    @NotNull
     public int getHttpThreadCount()
     {
         return httpThreadCount;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreConfig.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreConfig.java
index 608c274f3c86..e688c51d53b9 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreConfig.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreConfig.java
@@ -207,7 +207,6 @@ public ThriftMetastoreConfig setDelegationTokenCacheTtl(Duration delegationToken
         return this;
     }
 
-    @NotNull
     @Min(0)
     public long getDelegationTokenCacheMaximumSize()
     {
diff --git a/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryConfig.java b/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryConfig.java
index 3251809fb2c6..5c2b91e4ecb1 100644
--- a/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryConfig.java
+++ b/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryConfig.java
@@ -23,7 +23,6 @@ public class MemoryConfig
     private DataSize maxDataPerNode = DataSize.of(128, DataSize.Unit.MEGABYTE);
     private boolean enableLazyDynamicFiltering = true;
 
-    @NotNull
     public int getSplitsPerNode()
     {
         return splitsPerNode;
diff --git a/plugin/trino-opensearch/src/main/java/io/trino/plugin/opensearch/OpenSearchConfig.java b/plugin/trino-opensearch/src/main/java/io/trino/plugin/opensearch/OpenSearchConfig.java
index febbe8dfc0c1..f13706c59f7e 100644
--- a/plugin/trino-opensearch/src/main/java/io/trino/plugin/opensearch/OpenSearchConfig.java
+++ b/plugin/trino-opensearch/src/main/java/io/trino/plugin/opensearch/OpenSearchConfig.java
@@ -101,7 +101,6 @@ public OpenSearchConfig setDefaultSchema(String defaultSchema)
         return this;
     }
 
-    @NotNull
     @Min(1)
     public int getScrollSize()
     {
@@ -223,7 +222,6 @@ public OpenSearchConfig setMaxHttpConnections(int size)
         return this;
     }
 
-    @NotNull
     public int getMaxHttpConnections()
     {
         return maxHttpConnections;
@@ -237,7 +235,6 @@ public OpenSearchConfig setHttpThreadCount(int count)
         return this;
     }
 
-    @NotNull
     public int getHttpThreadCount()
     {
         return httpThreadCount;
diff --git a/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OracleConfig.java b/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OracleConfig.java
index 6df60f371979..1c214315368e 100644
--- a/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OracleConfig.java
+++ b/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OracleConfig.java
@@ -39,7 +39,6 @@ public class OracleConfig
     private int connectionPoolMaxSize = 30;
     private Duration inactiveConnectionTimeout = new Duration(20, MINUTES);
 
-    @NotNull
     public boolean isSynonymsEnabled()
     {
         return synonymsEnabled;
@@ -90,7 +89,6 @@ public OracleConfig setNumberRoundingMode(RoundingMode numberRoundingMode)
         return this;
     }
 
-    @NotNull
     public boolean isConnectionPoolEnabled()
     {
         return connectionPoolEnabled;
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotConfig.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotConfig.java
index a0d4f0d10364..5117e4720afd 100755
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotConfig.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotConfig.java
@@ -109,7 +109,6 @@ public PinotConfig setMetadataCacheExpiry(Duration metadataCacheExpiry)
         return this;
     }
 
-    @NotNull
     public int getEstimatedSizeInBytesForNonNumericColumn()
     {
         return estimatedSizeInBytesForNonNumericColumn;
diff --git a/pom.xml b/pom.xml
index 8eb732c6f16b..1ff861a3ba70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2674,6 +2674,7 @@
                                     -Xep:NarrowingCompoundAssignment:ERROR \
                                     -Xep:NullOptional:ERROR \
                                     -Xep:NullableOptional:ERROR \
+                                    -Xep:NullablePrimitive:ERROR \
                                     -Xep:ObjectToString:ERROR \
                                     -Xep:OptionalNotPresent:ERROR \
                                     -Xep:OrphanedFormatString:ERROR \