diff --git a/src/queue.ts b/src/queue.ts
index 73c2a7f..4e14837 100644
--- a/src/queue.ts
+++ b/src/queue.ts
@@ -161,6 +161,8 @@ export class TaskQueue {
           jobId: `create-${key}`,
           attempts: 3,
           backoff: { type: "exponential", delay: 5000 },
+          removeOnComplete: true,
+          removeOnFail: true,
         },
       );
     } catch (err: unknown) {
@@ -201,6 +203,8 @@ export class TaskQueue {
         jobId: `cleanup-${workspaceName}`,
         attempts: 5,
         backoff: { type: "exponential", delay: 10000 },
+        removeOnComplete: true,
+        removeOnFail: true,
       },
     );
 
@@ -311,6 +315,8 @@ export class TaskQueue {
                 jobId: `cleanup-stale-${ws.name}-${Date.now()}`,
                 attempts: 5,
                 backoff: { type: "exponential", delay: 10000 },
+                removeOnComplete: true,
+                removeOnFail: true,
               },
             );
           } catch (err) {