diff --git a/lib/util/cache/package/redis.ts b/lib/util/cache/package/redis.ts
index 5f1e93e51cf788..93ace4d668e8b3 100644
--- a/lib/util/cache/package/redis.ts
+++ b/lib/util/cache/package/redis.ts
@@ -11,7 +11,7 @@ function getKey(namespace: string, key: string): string {
 
 export function end(): void {
   try {
-    client?.nodeRedis?.end(true); // TODO: Why is this not supported by client directly?
+    client?.nodeRedis?.end(true); // TODO: https://github.com/renovatebot/renovate/issues/9714
   } catch (err) {
     logger.warn({ err }, 'Redis cache end failed');
   }
diff --git a/lib/versioning/index.spec.ts b/lib/versioning/index.spec.ts
index 14ff34666c5dc9..3fc38bad85b1c7 100644
--- a/lib/versioning/index.spec.ts
+++ b/lib/versioning/index.spec.ts
@@ -22,7 +22,7 @@ describe('allVersioning.get(versioning)', () => {
       // eslint-disable-next-line new-cap
       const mod = isVersioningApiConstructor(module) ? new module() : module;
 
-      // TODO: test required api
+      // TODO: https://github.com/renovatebot/renovate/issues/9715
       if (!mod.isValid || !mod.isVersion) {
         throw Error(`Missing api on ${name}`);
       }
diff --git a/lib/versioning/node/index.ts b/lib/versioning/node/index.ts
index 9a78f7b53fbcfc..4cb3ede8b1d6d8 100644
--- a/lib/versioning/node/index.ts
+++ b/lib/versioning/node/index.ts
@@ -34,7 +34,7 @@ export function isStable(version: string): boolean {
     const major = npm.getMajor(version);
     const schedule = nodeSchedule[`v${major}`];
     if (schedule?.lts) {
-      // TODO: use the exact release that started LTS
+      // TODO: https://github.com/renovatebot/renovate/issues/9716
       return DateTime.local() > DateTime.fromISO(schedule.lts);
     }
   }
diff --git a/lib/versioning/regex/index.ts b/lib/versioning/regex/index.ts
index 3008231a213d97..567fa9c89eae08 100644
--- a/lib/versioning/regex/index.ts
+++ b/lib/versioning/regex/index.ts
@@ -61,8 +61,7 @@ export class RegExpVersioningApi extends GenericVersioningApi<RegExpVersion> {
       throw error;
     }
 
-    // TODO: should we validate the user has not added extra unsupported
-    // capture groups?
+    // TODO: https://github.com/renovatebot/renovate/issues/9717
     this._config = regEx(new_config);
   }
 
diff --git a/lib/workers/branch/index.spec.ts b/lib/workers/branch/index.spec.ts
index 097e78b5490a7e..925af3cbb6d8e1 100644
--- a/lib/workers/branch/index.spec.ts
+++ b/lib/workers/branch/index.spec.ts
@@ -128,11 +128,7 @@ describe(getName(__filename), () => {
           releaseTimestamp: new Date().getTime(),
           stabilityDays: 1,
         },
-        /* TODO: This test is probably broken and needs to be fixed.
-           The type definition for "releaseTimestamp" is a string. But when I change it to
-           one the test starts failing. Once this test has been fixed, the never typing can be removed.
-           And instead replaced with the pattern used on the other places that have a config.upgrades
-        */
+        // TODO: https://github.com/renovatebot/renovate/issues/9718
       ] as never;
 
       git.branchExists.mockReturnValue(false);
diff --git a/lib/workers/branch/index.ts b/lib/workers/branch/index.ts
index d5359e2028110a..4854473e11137e 100644
--- a/lib/workers/branch/index.ts
+++ b/lib/workers/branch/index.ts
@@ -473,7 +473,7 @@ export async function processBranch(
       logger.debug('Reached PR limit - skipping PR creation');
       return { branchExists, result: BranchResult.PrLimitReached };
     }
-    // TODO: ensurePr should check for automerge itself
+    // TODO: https://github.com/renovatebot/renovate/issues/9719
     if (result === PrResult.AwaitingApproval) {
       return { branchExists, result: BranchResult.NeedsPrApproval };
     }
diff --git a/lib/workers/branch/reuse.ts b/lib/workers/branch/reuse.ts
index dabee5d66e463c..00470eee4091d1 100644
--- a/lib/workers/branch/reuse.ts
+++ b/lib/workers/branch/reuse.ts
@@ -55,7 +55,7 @@ export async function shouldReuseExistingBranch(
       logger.debug(`Branch is stale and needs rebasing`);
       // We can rebase the branch only if no PR or PR can be rebased
       if (await isBranchModified(branchName)) {
-        // TODO: Warn here so that it appears in PR body
+        // TODO: https://github.com/renovatebot/renovate/issues/9720
         logger.debug('Cannot rebase branch as it has been modified');
         return { reuseExistingBranch: true, isModified: true };
       }
@@ -82,7 +82,7 @@ export async function shouldReuseExistingBranch(
       return { reuseExistingBranch: false };
     }
     // Don't do anything different, but warn
-    // TODO: Add warning to PR
+    // TODO: https://github.com/renovatebot/renovate/issues/9720
     logger.debug(`Branch is not mergeable but can't be rebased`);
   }
   logger.debug(`Branch does not need rebasing`);
diff --git a/lib/workers/repository/process/lookup/index.spec.ts b/lib/workers/repository/process/lookup/index.spec.ts
index d457c3a565ee53..bd492a81e8460c 100644
--- a/lib/workers/repository/process/lookup/index.spec.ts
+++ b/lib/workers/repository/process/lookup/index.spec.ts
@@ -947,7 +947,7 @@ describe(getName(__filename), () => {
       config.lockedVersion = '0.9.4';
       config.currentValue = '~=0.9';
       config.depName = 'q';
-      // TODO: we are using npm as source to test pep440
+      // TODO: https://github.com/renovatebot/renovate/issues/9721
       config.datasource = datasourceNpmId;
       nock('https://registry.npmjs.org').get('/q').reply(200, qJson);
       const res = await lookup.lookupUpdates(config);