diff --git a/src/routes/api/v1/libs/+server.ts b/src/routes/api/v1/libs/+server.ts
index a2e3809..b84e195 100644
--- a/src/routes/api/v1/libs/+server.ts
+++ b/src/routes/api/v1/libs/+server.ts
@@ -6,6 +6,7 @@ import { json } from '@sveltejs/kit';
 import type { RequestHandler } from './$types';
 import { getClient } from '$lib/server/db/client';
 import { RepositoryService } from '$lib/server/services/repository.service';
+import { getQueue } from '$lib/server/pipeline/startup';
 import { handleServiceError } from '$lib/server/utils/validation';
 
 function getService() {
@@ -55,7 +56,10 @@ export const POST: RequestHandler = async ({ request }) => {
 
 		let jobResponse: { id: string; status: string } | null = null;
 		if (body.autoIndex !== false) {
-			const job = service.createIndexingJob(repo.id);
+			const queue = getQueue();
+			const job = queue
+				? queue.enqueue(repo.id)
+				: service.createIndexingJob(repo.id);
 			jobResponse = { id: job.id, status: job.status };
 		}
 
diff --git a/src/routes/api/v1/libs/[id]/index/+server.ts b/src/routes/api/v1/libs/[id]/index/+server.ts
index e673f33..30342b7 100644
--- a/src/routes/api/v1/libs/[id]/index/+server.ts
+++ b/src/routes/api/v1/libs/[id]/index/+server.ts
@@ -5,6 +5,7 @@ import { json } from '@sveltejs/kit';
 import type { RequestHandler } from './$types';
 import { getClient } from '$lib/server/db/client';
 import { RepositoryService } from '$lib/server/services/repository.service';
+import { getQueue } from '$lib/server/pipeline/startup';
 import { handleServiceError, NotFoundError } from '$lib/server/utils/validation';
 
 export const POST: RequestHandler = async ({ params, request }) => {
@@ -23,7 +24,12 @@ export const POST: RequestHandler = async ({ params, request }) => {
 			// body is optional
 		}
 
-		const job = service.createIndexingJob(id, versionId);
+		// Use the queue so processNext() is triggered immediately.
+		// Falls back to direct DB insert if the queue isn't initialised yet.
+		const queue = getQueue();
+		const job = queue
+			? queue.enqueue(id, versionId)
+			: service.createIndexingJob(id, versionId);
 
 		return json({ job }, { status: 202 });
 	} catch (err) {
diff --git a/src/routes/api/v1/libs/[id]/versions/[tag]/index/+server.ts b/src/routes/api/v1/libs/[id]/versions/[tag]/index/+server.ts
index 0016e67..c278788 100644
--- a/src/routes/api/v1/libs/[id]/versions/[tag]/index/+server.ts
+++ b/src/routes/api/v1/libs/[id]/versions/[tag]/index/+server.ts
@@ -7,6 +7,7 @@ import type { RequestHandler } from './$types';
 import { getClient } from '$lib/server/db/client';
 import { RepositoryService } from '$lib/server/services/repository.service';
 import { VersionService } from '$lib/server/services/version.service';
+import { getQueue } from '$lib/server/pipeline/startup';
 import { handleServiceError, NotFoundError } from '$lib/server/utils/validation';
 
 function getServices() {
@@ -37,7 +38,10 @@ export const POST: RequestHandler = ({ params }) => {
 			throw new NotFoundError(`Version ${tag} not found for repository ${repositoryId}`);
 		}
 
-		const job = repoService.createIndexingJob(repositoryId, version.id);
+		const queue = getQueue();
+		const job = queue
+			? queue.enqueue(repositoryId, version.id)
+			: repoService.createIndexingJob(repositoryId, version.id);
 		return json({ job }, { status: 202 });
 	} catch (err) {
 		return handleServiceError(err);