diff --git a/data-plane/background.ts b/data-plane/background.ts
index 8da74ed..6350a25 100644
--- a/data-plane/background.ts
+++ b/data-plane/background.ts
@@ -6,7 +6,7 @@ import { Database } from "./db/index.ts";
 export class BackgroundQueue {
   queue = new PQueue();
   destroyed = false;
-  private processAllInterval: number | null = null;
+  private processAllInterval: ReturnType<typeof setInterval> | null = null;
   private isProcessingAll = false;
 
   constructor(public db: Database) {}
@@ -59,7 +59,7 @@ export class BackgroundQueue {
       }
     }, 10000); // Log every 10 seconds
 
-    let timeoutId: number | undefined;
+    let timeoutId: ReturnType<typeof setTimeout> | undefined;
     try {
       // Add timeout protection to prevent hanging
       const processPromise = this.queue.onIdle();
diff --git a/data-plane/subscription.ts b/data-plane/subscription.ts
index fa9e252..947f09f 100644
--- a/data-plane/subscription.ts
+++ b/data-plane/subscription.ts
@@ -93,7 +93,7 @@ export class RepoSubscription {
       if (this.opts.cfg.debugMode) {
         const timeoutMs = 10000;
         // Runner destroy with timeout and proper timer cleanup
-        let destroyTimeoutId: number | undefined;
+        let destroyTimeoutId: ReturnType<typeof setTimeout> | undefined;
         try {
           const timeoutPromise = new Promise<never>((_, reject) => {
             destroyTimeoutId = setTimeout(
@@ -113,7 +113,7 @@ export class RepoSubscription {
           }
         }
         // Background drain with timeout and proper timer cleanup
-        let bgTimeoutId: number | undefined;
+        let bgTimeoutId: ReturnType<typeof setTimeout> | undefined;
         try {
           const timeoutPromise = new Promise<never>((_, reject) => {
             bgTimeoutId = setTimeout(