diff --git a/build-logic/src/main/kotlin/polaris-java.gradle.kts b/build-logic/src/main/kotlin/polaris-java.gradle.kts
index 45263a427c..3a9498e792 100644
--- a/build-logic/src/main/kotlin/polaris-java.gradle.kts
+++ b/build-logic/src/main/kotlin/polaris-java.gradle.kts
@@ -31,7 +31,10 @@ tasks.withType(JavaCompile::class.java).configureEach {
   options.compilerArgs.addAll(listOf("-Xlint:unchecked", "-Xlint:deprecation"))
   options.errorprone.disableAllWarnings = true
   options.errorprone.disableWarningsInGeneratedCode = true
-  options.errorprone.error("StringCaseLocaleUsage")
+  options.errorprone.error(
+    "MissingOverride",
+    "StringCaseLocaleUsage",
+  )
 }
 
 tasks.register("format").configure { dependsOn("spotlessApply") }
diff --git a/extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/EclipseLinkPolarisMetaStoreManagerFactory.java b/extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/EclipseLinkPolarisMetaStoreManagerFactory.java
index ff11d01283..94fe916733 100644
--- a/extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/EclipseLinkPolarisMetaStoreManagerFactory.java
+++ b/extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/EclipseLinkPolarisMetaStoreManagerFactory.java
@@ -38,10 +38,12 @@ public class EclipseLinkPolarisMetaStoreManagerFactory
   @JsonProperty("persistence-unit")
   private String persistenceUnitName;
 
+  @Override
   protected PolarisEclipseLinkStore createBackingStore(@NotNull PolarisDiagnostics diagnostics) {
     return new PolarisEclipseLinkStore(diagnostics);
   }
 
+  @Override
   protected PolarisMetaStoreSession createMetaStoreSession(
       @NotNull PolarisEclipseLinkStore store, @NotNull RealmContext realmContext) {
     return new PolarisEclipseLinkMetaStoreSessionImpl(
diff --git a/extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java b/extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java
index c57509ee7b..4d416b65a6 100644
--- a/extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java
+++ b/extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java
@@ -552,6 +552,7 @@ public List<PolarisEntityActiveRecord> lookupEntityActiveBatch(
   }
 
   /** {@inheritDoc} */
+  @Override
   public boolean hasChildren(
       @NotNull PolarisCallContext callContext,
       @Nullable PolarisEntityType entityType,
diff --git a/polaris-core/src/main/java/io/polaris/core/PolarisDefaultDiagServiceImpl.java b/polaris-core/src/main/java/io/polaris/core/PolarisDefaultDiagServiceImpl.java
index 74acd06cd7..bc374518ad 100644
--- a/polaris-core/src/main/java/io/polaris/core/PolarisDefaultDiagServiceImpl.java
+++ b/polaris-core/src/main/java/io/polaris/core/PolarisDefaultDiagServiceImpl.java
@@ -65,6 +65,7 @@ public RuntimeException fail(
    * @throws RuntimeException if `reference` is null
    */
   @Contract("null, _ -> fail")
+  @Override
   public <T> T checkNotNull(final T reference, final String signature) {
     return Preconditions.checkNotNull(reference, signature);
   }
@@ -82,6 +83,7 @@ public <T> T checkNotNull(final T reference, final String signature) {
    * @throws RuntimeException if `reference` is null
    */
   @Contract("null, _, _, _ -> fail")
+  @Override
   public <T> T checkNotNull(
       final T reference,
       final String signature,
@@ -100,6 +102,7 @@ public <T> T checkNotNull(
    * @throws RuntimeException if `condition` is not true
    */
   @Contract("false, _ -> fail")
+  @Override
   public void check(final boolean expression, final String signature) {
     Preconditions.checkState(expression, signature);
   }
@@ -116,6 +119,7 @@ public void check(final boolean expression, final String signature) {
    * @throws RuntimeException if condition` is not true
    */
   @Contract("false, _, _, _ -> fail")
+  @Override
   public void check(
       final boolean expression,
       final String signature,
diff --git a/polaris-core/src/main/java/io/polaris/core/context/CallContext.java b/polaris-core/src/main/java/io/polaris/core/context/CallContext.java
index 951bd3346a..57595b244d 100644
--- a/polaris-core/src/main/java/io/polaris/core/context/CallContext.java
+++ b/polaris-core/src/main/java/io/polaris/core/context/CallContext.java
@@ -135,6 +135,7 @@ public Map<String, Object> contextVariables() {
         contextVariables().computeIfAbsent(CLOSEABLES, key -> new CloseableGroup());
   }
 
+  @Override
   default void close() {
     if (CURRENT_CONTEXT.get() == this) {
       unsetCurrentContext();
diff --git a/polaris-core/src/main/java/io/polaris/core/entity/CatalogEntity.java b/polaris-core/src/main/java/io/polaris/core/entity/CatalogEntity.java
index 1b01ab6559..8f7f4f6d09 100644
--- a/polaris-core/src/main/java/io/polaris/core/entity/CatalogEntity.java
+++ b/polaris-core/src/main/java/io/polaris/core/entity/CatalogEntity.java
@@ -272,6 +272,7 @@ public Builder setStorageConfigurationInfo(
       return this;
     }
 
+    @Override
     public CatalogEntity build() {
       return new CatalogEntity(buildBase());
     }
diff --git a/polaris-core/src/main/java/io/polaris/core/entity/CatalogRoleEntity.java b/polaris-core/src/main/java/io/polaris/core/entity/CatalogRoleEntity.java
index 043e1bb285..ec61c755fe 100644
--- a/polaris-core/src/main/java/io/polaris/core/entity/CatalogRoleEntity.java
+++ b/polaris-core/src/main/java/io/polaris/core/entity/CatalogRoleEntity.java
@@ -58,6 +58,7 @@ public Builder(CatalogRoleEntity original) {
       super(original);
     }
 
+    @Override
     public CatalogRoleEntity build() {
       return new CatalogRoleEntity(buildBase());
     }
diff --git a/polaris-core/src/main/java/io/polaris/core/entity/NamespaceEntity.java b/polaris-core/src/main/java/io/polaris/core/entity/NamespaceEntity.java
index 523b47cb42..c923dde56d 100644
--- a/polaris-core/src/main/java/io/polaris/core/entity/NamespaceEntity.java
+++ b/polaris-core/src/main/java/io/polaris/core/entity/NamespaceEntity.java
@@ -82,6 +82,7 @@ public Builder setParentNamespace(Namespace namespace) {
       return this;
     }
 
+    @Override
     public NamespaceEntity build() {
       return new NamespaceEntity(buildBase());
     }
diff --git a/polaris-core/src/main/java/io/polaris/core/entity/PolarisEntity.java b/polaris-core/src/main/java/io/polaris/core/entity/PolarisEntity.java
index 031deb0b6b..1eaf2c7e39 100644
--- a/polaris-core/src/main/java/io/polaris/core/entity/PolarisEntity.java
+++ b/polaris-core/src/main/java/io/polaris/core/entity/PolarisEntity.java
@@ -187,11 +187,13 @@ public PolarisEntity(@NotNull PolarisBaseEntity sourceEntity) {
   }
 
   @JsonIgnore
+  @Override
   public PolarisEntityType getType() {
     return PolarisEntityType.fromCode(getTypeCode());
   }
 
   @JsonIgnore
+  @Override
   public PolarisEntitySubType getSubType() {
     return PolarisEntitySubType.fromCode(getSubTypeCode());
   }
@@ -268,6 +270,7 @@ public Builder(PolarisEntity original) {
       super(original);
     }
 
+    @Override
     public PolarisEntity build() {
       return buildBase();
     }
diff --git a/polaris-core/src/main/java/io/polaris/core/entity/PrincipalEntity.java b/polaris-core/src/main/java/io/polaris/core/entity/PrincipalEntity.java
index eaa8bfc7e3..c150e3b2be 100644
--- a/polaris-core/src/main/java/io/polaris/core/entity/PrincipalEntity.java
+++ b/polaris-core/src/main/java/io/polaris/core/entity/PrincipalEntity.java
@@ -75,6 +75,7 @@ public Builder setCredentialRotationRequiredState() {
       return this;
     }
 
+    @Override
     public PrincipalEntity build() {
       return new PrincipalEntity(buildBase());
     }
diff --git a/polaris-core/src/main/java/io/polaris/core/entity/PrincipalRoleEntity.java b/polaris-core/src/main/java/io/polaris/core/entity/PrincipalRoleEntity.java
index 44732e875b..a97639ccfb 100644
--- a/polaris-core/src/main/java/io/polaris/core/entity/PrincipalRoleEntity.java
+++ b/polaris-core/src/main/java/io/polaris/core/entity/PrincipalRoleEntity.java
@@ -62,6 +62,7 @@ public Builder(PrincipalRoleEntity original) {
       super(original);
     }
 
+    @Override
     public PrincipalRoleEntity build() {
       return new PrincipalRoleEntity(buildBase());
     }
diff --git a/polaris-core/src/main/java/io/polaris/core/entity/TableLikeEntity.java b/polaris-core/src/main/java/io/polaris/core/entity/TableLikeEntity.java
index 6aab5d2c6f..5592de66e5 100644
--- a/polaris-core/src/main/java/io/polaris/core/entity/TableLikeEntity.java
+++ b/polaris-core/src/main/java/io/polaris/core/entity/TableLikeEntity.java
@@ -77,6 +77,7 @@ public Builder(TableLikeEntity original) {
       super(original);
     }
 
+    @Override
     public TableLikeEntity build() {
       return new TableLikeEntity(buildBase());
     }
diff --git a/polaris-core/src/main/java/io/polaris/core/entity/TaskEntity.java b/polaris-core/src/main/java/io/polaris/core/entity/TaskEntity.java
index ca2d7d17c2..4dda56699c 100644
--- a/polaris-core/src/main/java/io/polaris/core/entity/TaskEntity.java
+++ b/polaris-core/src/main/java/io/polaris/core/entity/TaskEntity.java
@@ -95,6 +95,7 @@ public Builder withLastAttemptStartedTimestamp(long timestamp) {
       return this;
     }
 
+    @Override
     public TaskEntity build() {
       return new TaskEntity(buildBase());
     }
diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisMetaStoreManagerImpl.java b/polaris-core/src/main/java/io/polaris/core/persistence/PolarisMetaStoreManagerImpl.java
index 710fbed1d3..af213c512d 100644
--- a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisMetaStoreManagerImpl.java
+++ b/polaris-core/src/main/java/io/polaris/core/persistence/PolarisMetaStoreManagerImpl.java
@@ -957,6 +957,7 @@ public Map<String, String> deserializeProperties(PolarisCallContext callCtx, Str
   }
 
   /** {@inheritDoc} */
+  @Override
   public @NotNull CreatePrincipalResult createPrincipal(
       @NotNull PolarisCallContext callCtx, @NotNull PolarisBaseEntity principal) {
     // get metastore we should be using
diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisTreeMapMetaStoreSessionImpl.java b/polaris-core/src/main/java/io/polaris/core/persistence/PolarisTreeMapMetaStoreSessionImpl.java
index d4594693a0..a6cb8747c1 100644
--- a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisTreeMapMetaStoreSessionImpl.java
+++ b/polaris-core/src/main/java/io/polaris/core/persistence/PolarisTreeMapMetaStoreSessionImpl.java
@@ -90,6 +90,7 @@ public void runActionInReadTransaction(
   /**
    * @return new unique entity identifier
    */
+  @Override
   public long generateNewId(@NotNull PolarisCallContext callCtx) {
     return this.store.getNextSequence();
   }
@@ -369,6 +370,7 @@ public List<PolarisEntityActiveRecord> lookupEntityActiveBatch(
   }
 
   /** {@inheritDoc} */
+  @Override
   public boolean hasChildren(
       @NotNull PolarisCallContext callContext,
       @Nullable PolarisEntityType entityType,
diff --git a/polaris-service/src/main/java/io/polaris/service/auth/BasePolarisAuthenticator.java b/polaris-service/src/main/java/io/polaris/service/auth/BasePolarisAuthenticator.java
index 2a088c3f5c..aef9a9cae0 100644
--- a/polaris-service/src/main/java/io/polaris/service/auth/BasePolarisAuthenticator.java
+++ b/polaris-service/src/main/java/io/polaris/service/auth/BasePolarisAuthenticator.java
@@ -50,6 +50,7 @@ public abstract class BasePolarisAuthenticator
 
   protected RealmEntityManagerFactory entityManagerFactory;
 
+  @Override
   public void setEntityManagerFactory(RealmEntityManagerFactory entityManagerFactory) {
     this.entityManagerFactory = entityManagerFactory;
   }
diff --git a/polaris-service/src/main/java/io/polaris/service/auth/DefaultOAuth2ApiService.java b/polaris-service/src/main/java/io/polaris/service/auth/DefaultOAuth2ApiService.java
index 4b1e6d1fc7..d469d21ebe 100644
--- a/polaris-service/src/main/java/io/polaris/service/auth/DefaultOAuth2ApiService.java
+++ b/polaris-service/src/main/java/io/polaris/service/auth/DefaultOAuth2ApiService.java
@@ -125,6 +125,7 @@ public void setEntityManagerFactory(RealmEntityManagerFactory entityManagerFacto
     }
   }
 
+  @Override
   public void setTokenBroker(TokenBrokerFactory tokenBrokerFactory) {
     this.tokenBrokerFactory = tokenBrokerFactory;
   }
diff --git a/polaris-service/src/main/java/io/polaris/service/auth/JWTBroker.java b/polaris-service/src/main/java/io/polaris/service/auth/JWTBroker.java
index 1fa708f9db..29f98480c3 100644
--- a/polaris-service/src/main/java/io/polaris/service/auth/JWTBroker.java
+++ b/polaris-service/src/main/java/io/polaris/service/auth/JWTBroker.java
@@ -51,6 +51,7 @@ abstract class JWTBroker implements TokenBroker {
 
   abstract Algorithm getAlgorithm();
 
+  @Override
   public DecodedToken verify(String token) {
     JWTVerifier verifier = JWT.require(getAlgorithm()).build();
     DecodedJWT decodedJWT = verifier.verify(token);
diff --git a/polaris-service/src/main/java/io/polaris/service/auth/TokenInfoExchangeResponse.java b/polaris-service/src/main/java/io/polaris/service/auth/TokenInfoExchangeResponse.java
index a3e6f016cb..e8b27c11e7 100644
--- a/polaris-service/src/main/java/io/polaris/service/auth/TokenInfoExchangeResponse.java
+++ b/polaris-service/src/main/java/io/polaris/service/auth/TokenInfoExchangeResponse.java
@@ -34,6 +34,7 @@ public void setActive(boolean active) {
   private String scope;
 
   @JsonProperty("scope")
+  @Override
   public String getScope() {
     return scope;
   }
@@ -46,6 +47,7 @@ public void setScope(String scope) {
   private String clientId;
 
   @JsonProperty("client_id")
+  @Override
   public String getClientId() {
     return clientId;
   }
@@ -82,6 +84,7 @@ public void setExp(Long exp) {
   private String sub;
 
   @JsonProperty("sub")
+  @Override
   public String getSub() {
     return sub;
   }
diff --git a/polaris-service/src/test/java/io/polaris/service/catalog/BasePolarisCatalogTest.java b/polaris-service/src/test/java/io/polaris/service/catalog/BasePolarisCatalogTest.java
index a410d81eae..a0d062865a 100644
--- a/polaris-service/src/test/java/io/polaris/service/catalog/BasePolarisCatalogTest.java
+++ b/polaris-service/src/test/java/io/polaris/service/catalog/BasePolarisCatalogTest.java
@@ -1037,6 +1037,7 @@ public void testDropNotificationWhenTableExists() {
   }
 
   @Test
+  @Override
   public void testDropTableWithPurge() {
     if (this.requiresNamespaceCreate()) {
       ((SupportsNamespaces) catalog).createNamespace(NS);