diff --git a/plugins/azure-devops/src/api/AzureDevOpsApi.ts b/plugins/azure-devops/src/api/AzureDevOpsApi.ts
index 63e6dc3125..e4f4e32b6b 100644
--- a/plugins/azure-devops/src/api/AzureDevOpsApi.ts
+++ b/plugins/azure-devops/src/api/AzureDevOpsApi.ts
@@ -39,6 +39,7 @@ export interface AzureDevOpsApi {
   ): Promise<{ items: RepoBuild[] }>;
 
   getGitTags(
+    // TODO: Keep iterating down this rabbit hole on the client once the service has caught up
     projectName: string,
     repoName: string,
     options?: PullRequestOptions,
diff --git a/plugins/azure-devops/src/api/AzureDevOpsClient.ts b/plugins/azure-devops/src/api/AzureDevOpsClient.ts
index 96c10a7b2e..87a6c7e404 100644
--- a/plugins/azure-devops/src/api/AzureDevOpsClient.ts
+++ b/plugins/azure-devops/src/api/AzureDevOpsClient.ts
@@ -29,6 +29,7 @@ import { DiscoveryApi, IdentityApi } from '@backstage/core-plugin-api';
 import { AzureDevOpsApi } from './AzureDevOpsApi';
 import { ResponseError } from '@backstage/errors';
 
+// TODO: See red squiggly below
 export class AzureDevOpsClient implements AzureDevOpsApi {
   private readonly discoveryApi: DiscoveryApi;
   private readonly identityApi: IdentityApi;
diff --git a/plugins/azure-devops/src/hooks/useGitTags.ts b/plugins/azure-devops/src/hooks/useGitTags.ts
index b55012c7f0..88930109a9 100644
--- a/plugins/azure-devops/src/hooks/useGitTags.ts
+++ b/plugins/azure-devops/src/hooks/useGitTags.ts
@@ -28,6 +28,7 @@ import useAsync from 'react-use/lib/useAsync';
 import { useProjectRepoFromEntity } from './useProjectRepoFromEntity';
 
 export function useGitTags(
+  // TODO: Keep iterating down this rabbit hole on the client once the service has caught up
   entity: Entity,
   defaultLimit?: number,
   requestedStatus?: PullRequestStatus,