diff --git a/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposer.java
index f05a0e057d..8537d1a4a7 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposer.java
@@ -934,6 +934,7 @@ private static List<MethodDefinition> createCallableGetterMethods(
         .map(
             e ->
                 MethodDefinition.builder()
+                    .setIsOverride(true)
                     .setScope(ScopeNode.PUBLIC)
                     .setReturnType(e.getValue().type())
                     .setName(e.getKey())
diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/GrpcEchoStub.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/GrpcEchoStub.golden
index 3c32fbab4f..194849ba09 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/goldens/GrpcEchoStub.golden
+++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/GrpcEchoStub.golden
@@ -256,51 +256,63 @@ public class GrpcEchoStub extends EchoStub {
     return operationsStub;
   }
 
+  @Override
   public UnaryCallable<EchoRequest, EchoResponse> echoCallable() {
     return echoCallable;
   }
 
+  @Override
   public ServerStreamingCallable<ExpandRequest, EchoResponse> expandCallable() {
     return expandCallable;
   }
 
+  @Override
   public ClientStreamingCallable<EchoRequest, EchoResponse> collectCallable() {
     return collectCallable;
   }
 
+  @Override
   public BidiStreamingCallable<EchoRequest, EchoResponse> chatCallable() {
     return chatCallable;
   }
 
+  @Override
   public BidiStreamingCallable<EchoRequest, EchoResponse> chatAgainCallable() {
     return chatAgainCallable;
   }
 
+  @Override
   public UnaryCallable<PagedExpandRequest, PagedExpandResponse> pagedExpandCallable() {
     return pagedExpandCallable;
   }
 
+  @Override
   public UnaryCallable<PagedExpandRequest, PagedExpandPagedResponse> pagedExpandPagedCallable() {
     return pagedExpandPagedCallable;
   }
 
+  @Override
   public UnaryCallable<PagedExpandRequest, PagedExpandResponse> simplePagedExpandCallable() {
     return simplePagedExpandCallable;
   }
 
+  @Override
   public UnaryCallable<PagedExpandRequest, SimplePagedExpandPagedResponse>
       simplePagedExpandPagedCallable() {
     return simplePagedExpandPagedCallable;
   }
 
+  @Override
   public UnaryCallable<WaitRequest, Operation> waitCallable() {
     return waitCallable;
   }
 
+  @Override
   public OperationCallable<WaitRequest, WaitResponse, WaitMetadata> waitOperationCallable() {
     return waitOperationCallable;
   }
 
+  @Override
   public UnaryCallable<BlockRequest, BlockResponse> blockCallable() {
     return blockCallable;
   }
diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/GrpcPublisherStub.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/GrpcPublisherStub.golden
index 72fc5eff63..9e221ab5a2 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/goldens/GrpcPublisherStub.golden
+++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/GrpcPublisherStub.golden
@@ -363,54 +363,66 @@ public class GrpcPublisherStub extends PublisherStub {
     return operationsStub;
   }
 
+  @Override
   public UnaryCallable<Topic, Topic> createTopicCallable() {
     return createTopicCallable;
   }
 
+  @Override
   public UnaryCallable<UpdateTopicRequest, Topic> updateTopicCallable() {
     return updateTopicCallable;
   }
 
+  @Override
   public UnaryCallable<PublishRequest, PublishResponse> publishCallable() {
     return publishCallable;
   }
 
+  @Override
   public UnaryCallable<GetTopicRequest, Topic> getTopicCallable() {
     return getTopicCallable;
   }
 
+  @Override
   public UnaryCallable<ListTopicsRequest, ListTopicsResponse> listTopicsCallable() {
     return listTopicsCallable;
   }
 
+  @Override
   public UnaryCallable<ListTopicsRequest, ListTopicsPagedResponse> listTopicsPagedCallable() {
     return listTopicsPagedCallable;
   }
 
+  @Override
   public UnaryCallable<ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse>
       listTopicSubscriptionsCallable() {
     return listTopicSubscriptionsCallable;
   }
 
+  @Override
   public UnaryCallable<ListTopicSubscriptionsRequest, ListTopicSubscriptionsPagedResponse>
       listTopicSubscriptionsPagedCallable() {
     return listTopicSubscriptionsPagedCallable;
   }
 
+  @Override
   public UnaryCallable<ListTopicSnapshotsRequest, ListTopicSnapshotsResponse>
       listTopicSnapshotsCallable() {
     return listTopicSnapshotsCallable;
   }
 
+  @Override
   public UnaryCallable<ListTopicSnapshotsRequest, ListTopicSnapshotsPagedResponse>
       listTopicSnapshotsPagedCallable() {
     return listTopicSnapshotsPagedCallable;
   }
 
+  @Override
   public UnaryCallable<DeleteTopicRequest, Empty> deleteTopicCallable() {
     return deleteTopicCallable;
   }
 
+  @Override
   public UnaryCallable<DetachSubscriptionRequest, DetachSubscriptionResponse>
       detachSubscriptionCallable() {
     return detachSubscriptionCallable;
diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/GrpcTestingStub.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/GrpcTestingStub.golden
index 5c6a4e4626..b1d8da085a 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/goldens/GrpcTestingStub.golden
+++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/GrpcTestingStub.golden
@@ -324,46 +324,57 @@ public class GrpcTestingStub extends TestingStub {
     return operationsStub;
   }
 
+  @Override
   public UnaryCallable<CreateSessionRequest, Session> createSessionCallable() {
     return createSessionCallable;
   }
 
+  @Override
   public UnaryCallable<GetSessionRequest, Session> getSessionCallable() {
     return getSessionCallable;
   }
 
+  @Override
   public UnaryCallable<ListSessionsRequest, ListSessionsResponse> listSessionsCallable() {
     return listSessionsCallable;
   }
 
+  @Override
   public UnaryCallable<ListSessionsRequest, ListSessionsPagedResponse> listSessionsPagedCallable() {
     return listSessionsPagedCallable;
   }
 
+  @Override
   public UnaryCallable<DeleteSessionRequest, Empty> deleteSessionCallable() {
     return deleteSessionCallable;
   }
 
+  @Override
   public UnaryCallable<ReportSessionRequest, ReportSessionResponse> reportSessionCallable() {
     return reportSessionCallable;
   }
 
+  @Override
   public UnaryCallable<GetTestRequest, Test> getTestCallable() {
     return getTestCallable;
   }
 
+  @Override
   public UnaryCallable<ListTestsRequest, ListTestsResponse> listTestsCallable() {
     return listTestsCallable;
   }
 
+  @Override
   public UnaryCallable<ListTestsRequest, ListTestsPagedResponse> listTestsPagedCallable() {
     return listTestsPagedCallable;
   }
 
+  @Override
   public UnaryCallable<DeleteTestRequest, Empty> deleteTestCallable() {
     return deleteTestCallable;
   }
 
+  @Override
   public UnaryCallable<VerifyTestRequest, VerifyTestResponse> verifyTestCallable() {
     return verifyTestCallable;
   }
diff --git a/test/integration/goldens/asset/GrpcAssetServiceStub.java b/test/integration/goldens/asset/GrpcAssetServiceStub.java
index b613cceb4e..baaefdd441 100644
--- a/test/integration/goldens/asset/GrpcAssetServiceStub.java
+++ b/test/integration/goldens/asset/GrpcAssetServiceStub.java
@@ -385,55 +385,67 @@ public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
 
+  @Override
   public UnaryCallable<ExportAssetsRequest, Operation> exportAssetsCallable() {
     return exportAssetsCallable;
   }
 
+  @Override
   public OperationCallable<ExportAssetsRequest, ExportAssetsResponse, ExportAssetsRequest>
       exportAssetsOperationCallable() {
     return exportAssetsOperationCallable;
   }
 
+  @Override
   public UnaryCallable<BatchGetAssetsHistoryRequest, BatchGetAssetsHistoryResponse>
       batchGetAssetsHistoryCallable() {
     return batchGetAssetsHistoryCallable;
   }
 
+  @Override
   public UnaryCallable<CreateFeedRequest, Feed> createFeedCallable() {
     return createFeedCallable;
   }
 
+  @Override
   public UnaryCallable<GetFeedRequest, Feed> getFeedCallable() {
     return getFeedCallable;
   }
 
+  @Override
   public UnaryCallable<ListFeedsRequest, ListFeedsResponse> listFeedsCallable() {
     return listFeedsCallable;
   }
 
+  @Override
   public UnaryCallable<UpdateFeedRequest, Feed> updateFeedCallable() {
     return updateFeedCallable;
   }
 
+  @Override
   public UnaryCallable<DeleteFeedRequest, Empty> deleteFeedCallable() {
     return deleteFeedCallable;
   }
 
+  @Override
   public UnaryCallable<SearchAllResourcesRequest, SearchAllResourcesResponse>
       searchAllResourcesCallable() {
     return searchAllResourcesCallable;
   }
 
+  @Override
   public UnaryCallable<SearchAllResourcesRequest, SearchAllResourcesPagedResponse>
       searchAllResourcesPagedCallable() {
     return searchAllResourcesPagedCallable;
   }
 
+  @Override
   public UnaryCallable<SearchAllIamPoliciesRequest, SearchAllIamPoliciesResponse>
       searchAllIamPoliciesCallable() {
     return searchAllIamPoliciesCallable;
   }
 
+  @Override
   public UnaryCallable<SearchAllIamPoliciesRequest, SearchAllIamPoliciesPagedResponse>
       searchAllIamPoliciesPagedCallable() {
     return searchAllIamPoliciesPagedCallable;
diff --git a/test/integration/goldens/credentials/GrpcIamCredentialsStub.java b/test/integration/goldens/credentials/GrpcIamCredentialsStub.java
index 869e84c892..55cc0068d5 100644
--- a/test/integration/goldens/credentials/GrpcIamCredentialsStub.java
+++ b/test/integration/goldens/credentials/GrpcIamCredentialsStub.java
@@ -216,19 +216,23 @@ public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
 
+  @Override
   public UnaryCallable<GenerateAccessTokenRequest, GenerateAccessTokenResponse>
       generateAccessTokenCallable() {
     return generateAccessTokenCallable;
   }
 
+  @Override
   public UnaryCallable<GenerateIdTokenRequest, GenerateIdTokenResponse> generateIdTokenCallable() {
     return generateIdTokenCallable;
   }
 
+  @Override
   public UnaryCallable<SignBlobRequest, SignBlobResponse> signBlobCallable() {
     return signBlobCallable;
   }
 
+  @Override
   public UnaryCallable<SignJwtRequest, SignJwtResponse> signJwtCallable() {
     return signJwtCallable;
   }
diff --git a/test/integration/goldens/library/GrpcLibraryServiceStub.java b/test/integration/goldens/library/GrpcLibraryServiceStub.java
index 90f7a9a613..c2d424a93a 100644
--- a/test/integration/goldens/library/GrpcLibraryServiceStub.java
+++ b/test/integration/goldens/library/GrpcLibraryServiceStub.java
@@ -383,54 +383,67 @@ public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
 
+  @Override
   public UnaryCallable<CreateShelfRequest, Shelf> createShelfCallable() {
     return createShelfCallable;
   }
 
+  @Override
   public UnaryCallable<GetShelfRequest, Shelf> getShelfCallable() {
     return getShelfCallable;
   }
 
+  @Override
   public UnaryCallable<ListShelvesRequest, ListShelvesResponse> listShelvesCallable() {
     return listShelvesCallable;
   }
 
+  @Override
   public UnaryCallable<ListShelvesRequest, ListShelvesPagedResponse> listShelvesPagedCallable() {
     return listShelvesPagedCallable;
   }
 
+  @Override
   public UnaryCallable<DeleteShelfRequest, Empty> deleteShelfCallable() {
     return deleteShelfCallable;
   }
 
+  @Override
   public UnaryCallable<MergeShelvesRequest, Shelf> mergeShelvesCallable() {
     return mergeShelvesCallable;
   }
 
+  @Override
   public UnaryCallable<CreateBookRequest, Book> createBookCallable() {
     return createBookCallable;
   }
 
+  @Override
   public UnaryCallable<GetBookRequest, Book> getBookCallable() {
     return getBookCallable;
   }
 
+  @Override
   public UnaryCallable<ListBooksRequest, ListBooksResponse> listBooksCallable() {
     return listBooksCallable;
   }
 
+  @Override
   public UnaryCallable<ListBooksRequest, ListBooksPagedResponse> listBooksPagedCallable() {
     return listBooksPagedCallable;
   }
 
+  @Override
   public UnaryCallable<DeleteBookRequest, Empty> deleteBookCallable() {
     return deleteBookCallable;
   }
 
+  @Override
   public UnaryCallable<UpdateBookRequest, Book> updateBookCallable() {
     return updateBookCallable;
   }
 
+  @Override
   public UnaryCallable<MoveBookRequest, Book> moveBookCallable() {
     return moveBookCallable;
   }
diff --git a/test/integration/goldens/logging/GrpcConfigServiceV2Stub.java b/test/integration/goldens/logging/GrpcConfigServiceV2Stub.java
index 21515b9731..1516b53b47 100644
--- a/test/integration/goldens/logging/GrpcConfigServiceV2Stub.java
+++ b/test/integration/goldens/logging/GrpcConfigServiceV2Stub.java
@@ -532,75 +532,93 @@ public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
 
+  @Override
   public UnaryCallable<ListBucketsRequest, ListBucketsResponse> listBucketsCallable() {
     return listBucketsCallable;
   }
 
+  @Override
   public UnaryCallable<ListBucketsRequest, ListBucketsPagedResponse> listBucketsPagedCallable() {
     return listBucketsPagedCallable;
   }
 
+  @Override
   public UnaryCallable<GetBucketRequest, LogBucket> getBucketCallable() {
     return getBucketCallable;
   }
 
+  @Override
   public UnaryCallable<UpdateBucketRequest, LogBucket> updateBucketCallable() {
     return updateBucketCallable;
   }
 
+  @Override
   public UnaryCallable<ListSinksRequest, ListSinksResponse> listSinksCallable() {
     return listSinksCallable;
   }
 
+  @Override
   public UnaryCallable<ListSinksRequest, ListSinksPagedResponse> listSinksPagedCallable() {
     return listSinksPagedCallable;
   }
 
+  @Override
   public UnaryCallable<GetSinkRequest, LogSink> getSinkCallable() {
     return getSinkCallable;
   }
 
+  @Override
   public UnaryCallable<CreateSinkRequest, LogSink> createSinkCallable() {
     return createSinkCallable;
   }
 
+  @Override
   public UnaryCallable<UpdateSinkRequest, LogSink> updateSinkCallable() {
     return updateSinkCallable;
   }
 
+  @Override
   public UnaryCallable<DeleteSinkRequest, Empty> deleteSinkCallable() {
     return deleteSinkCallable;
   }
 
+  @Override
   public UnaryCallable<ListExclusionsRequest, ListExclusionsResponse> listExclusionsCallable() {
     return listExclusionsCallable;
   }
 
+  @Override
   public UnaryCallable<ListExclusionsRequest, ListExclusionsPagedResponse>
       listExclusionsPagedCallable() {
     return listExclusionsPagedCallable;
   }
 
+  @Override
   public UnaryCallable<GetExclusionRequest, LogExclusion> getExclusionCallable() {
     return getExclusionCallable;
   }
 
+  @Override
   public UnaryCallable<CreateExclusionRequest, LogExclusion> createExclusionCallable() {
     return createExclusionCallable;
   }
 
+  @Override
   public UnaryCallable<UpdateExclusionRequest, LogExclusion> updateExclusionCallable() {
     return updateExclusionCallable;
   }
 
+  @Override
   public UnaryCallable<DeleteExclusionRequest, Empty> deleteExclusionCallable() {
     return deleteExclusionCallable;
   }
 
+  @Override
   public UnaryCallable<GetCmekSettingsRequest, CmekSettings> getCmekSettingsCallable() {
     return getCmekSettingsCallable;
   }
 
+  @Override
   public UnaryCallable<UpdateCmekSettingsRequest, CmekSettings> updateCmekSettingsCallable() {
     return updateCmekSettingsCallable;
   }
diff --git a/test/integration/goldens/logging/GrpcLoggingServiceV2Stub.java b/test/integration/goldens/logging/GrpcLoggingServiceV2Stub.java
index d498e6f9f8..671ea68695 100644
--- a/test/integration/goldens/logging/GrpcLoggingServiceV2Stub.java
+++ b/test/integration/goldens/logging/GrpcLoggingServiceV2Stub.java
@@ -251,39 +251,47 @@ public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
 
+  @Override
   public UnaryCallable<DeleteLogRequest, Empty> deleteLogCallable() {
     return deleteLogCallable;
   }
 
+  @Override
   public UnaryCallable<WriteLogEntriesRequest, WriteLogEntriesResponse> writeLogEntriesCallable() {
     return writeLogEntriesCallable;
   }
 
+  @Override
   public UnaryCallable<ListLogEntriesRequest, ListLogEntriesResponse> listLogEntriesCallable() {
     return listLogEntriesCallable;
   }
 
+  @Override
   public UnaryCallable<ListLogEntriesRequest, ListLogEntriesPagedResponse>
       listLogEntriesPagedCallable() {
     return listLogEntriesPagedCallable;
   }
 
+  @Override
   public UnaryCallable<
           ListMonitoredResourceDescriptorsRequest, ListMonitoredResourceDescriptorsResponse>
       listMonitoredResourceDescriptorsCallable() {
     return listMonitoredResourceDescriptorsCallable;
   }
 
+  @Override
   public UnaryCallable<
           ListMonitoredResourceDescriptorsRequest, ListMonitoredResourceDescriptorsPagedResponse>
       listMonitoredResourceDescriptorsPagedCallable() {
     return listMonitoredResourceDescriptorsPagedCallable;
   }
 
+  @Override
   public UnaryCallable<ListLogsRequest, ListLogsResponse> listLogsCallable() {
     return listLogsCallable;
   }
 
+  @Override
   public UnaryCallable<ListLogsRequest, ListLogsPagedResponse> listLogsPagedCallable() {
     return listLogsPagedCallable;
   }
diff --git a/test/integration/goldens/logging/GrpcMetricsServiceV2Stub.java b/test/integration/goldens/logging/GrpcMetricsServiceV2Stub.java
index 0bb3e1b866..10507c44cd 100644
--- a/test/integration/goldens/logging/GrpcMetricsServiceV2Stub.java
+++ b/test/integration/goldens/logging/GrpcMetricsServiceV2Stub.java
@@ -246,27 +246,33 @@ public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
 
+  @Override
   public UnaryCallable<ListLogMetricsRequest, ListLogMetricsResponse> listLogMetricsCallable() {
     return listLogMetricsCallable;
   }
 
+  @Override
   public UnaryCallable<ListLogMetricsRequest, ListLogMetricsPagedResponse>
       listLogMetricsPagedCallable() {
     return listLogMetricsPagedCallable;
   }
 
+  @Override
   public UnaryCallable<GetLogMetricRequest, LogMetric> getLogMetricCallable() {
     return getLogMetricCallable;
   }
 
+  @Override
   public UnaryCallable<CreateLogMetricRequest, LogMetric> createLogMetricCallable() {
     return createLogMetricCallable;
   }
 
+  @Override
   public UnaryCallable<UpdateLogMetricRequest, LogMetric> updateLogMetricCallable() {
     return updateLogMetricCallable;
   }
 
+  @Override
   public UnaryCallable<DeleteLogMetricRequest, Empty> deleteLogMetricCallable() {
     return deleteLogMetricCallable;
   }
diff --git a/test/integration/goldens/redis/GrpcCloudRedisStub.java b/test/integration/goldens/redis/GrpcCloudRedisStub.java
index 416417d996..99f15a59c6 100644
--- a/test/integration/goldens/redis/GrpcCloudRedisStub.java
+++ b/test/integration/goldens/redis/GrpcCloudRedisStub.java
@@ -415,73 +415,90 @@ public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
 
+  @Override
   public UnaryCallable<ListInstancesRequest, ListInstancesResponse> listInstancesCallable() {
     return listInstancesCallable;
   }
 
+  @Override
   public UnaryCallable<ListInstancesRequest, ListInstancesPagedResponse>
       listInstancesPagedCallable() {
     return listInstancesPagedCallable;
   }
 
+  @Override
   public UnaryCallable<GetInstanceRequest, Instance> getInstanceCallable() {
     return getInstanceCallable;
   }
 
+  @Override
   public UnaryCallable<CreateInstanceRequest, Operation> createInstanceCallable() {
     return createInstanceCallable;
   }
 
+  @Override
   public OperationCallable<CreateInstanceRequest, Instance, Any> createInstanceOperationCallable() {
     return createInstanceOperationCallable;
   }
 
+  @Override
   public UnaryCallable<UpdateInstanceRequest, Operation> updateInstanceCallable() {
     return updateInstanceCallable;
   }
 
+  @Override
   public OperationCallable<UpdateInstanceRequest, Instance, Any> updateInstanceOperationCallable() {
     return updateInstanceOperationCallable;
   }
 
+  @Override
   public UnaryCallable<UpgradeInstanceRequest, Operation> upgradeInstanceCallable() {
     return upgradeInstanceCallable;
   }
 
+  @Override
   public OperationCallable<UpgradeInstanceRequest, Instance, Any>
       upgradeInstanceOperationCallable() {
     return upgradeInstanceOperationCallable;
   }
 
+  @Override
   public UnaryCallable<ImportInstanceRequest, Operation> importInstanceCallable() {
     return importInstanceCallable;
   }
 
+  @Override
   public OperationCallable<ImportInstanceRequest, Instance, Any> importInstanceOperationCallable() {
     return importInstanceOperationCallable;
   }
 
+  @Override
   public UnaryCallable<ExportInstanceRequest, Operation> exportInstanceCallable() {
     return exportInstanceCallable;
   }
 
+  @Override
   public OperationCallable<ExportInstanceRequest, Instance, Any> exportInstanceOperationCallable() {
     return exportInstanceOperationCallable;
   }
 
+  @Override
   public UnaryCallable<FailoverInstanceRequest, Operation> failoverInstanceCallable() {
     return failoverInstanceCallable;
   }
 
+  @Override
   public OperationCallable<FailoverInstanceRequest, Instance, Any>
       failoverInstanceOperationCallable() {
     return failoverInstanceOperationCallable;
   }
 
+  @Override
   public UnaryCallable<DeleteInstanceRequest, Operation> deleteInstanceCallable() {
     return deleteInstanceCallable;
   }
 
+  @Override
   public OperationCallable<DeleteInstanceRequest, Empty, Any> deleteInstanceOperationCallable() {
     return deleteInstanceOperationCallable;
   }