diff --git a/server/Dockerfile b/server/Dockerfile
index 1d4729142b..87b2e0a26a 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -113,6 +113,7 @@ ENV IMMICH_SOURCE_REF=${BUILD_SOURCE_REF}
 ENV IMMICH_SOURCE_COMMIT=${BUILD_SOURCE_COMMIT}
 ENV IMMICH_SOURCE_URL=https://github.com/immich-app/immich/commit/${BUILD_SOURCE_COMMIT}
 
+# TODO[YUCCA]: pin restic & put in correct place
 RUN apt-get update && apt-get install -y restic
 
 VOLUME /data
diff --git a/server/Dockerfile.dev b/server/Dockerfile.dev
index 1dcd44d04c..2e8e5b66ad 100644
--- a/server/Dockerfile.dev
+++ b/server/Dockerfile.dev
@@ -27,6 +27,7 @@ ENTRYPOINT ["tini", "--", "/bin/bash", "-c"]
 
 FROM dev AS dev-container-server
 
+# TODO[YUCCA]: pin restic & put in correct place
 RUN apt-get update --allow-releaseinfo-change && \
   apt-get install inetutils-ping openjdk-21-jre-headless \
   vim nano curl restic \
diff --git a/server/src/app.module.ts b/server/src/app.module.ts
index e570307f5b..a6ff7e45bd 100644
--- a/server/src/app.module.ts
+++ b/server/src/app.module.ts
@@ -1,3 +1,4 @@
+import { OrchestrationApiModule } from '@futo-org/backups-orchestrator-api/dist';
 import { BullModule } from '@nestjs/bullmq';
 import { Inject, Module, OnModuleDestroy, OnModuleInit } from '@nestjs/common';
 import { APP_FILTER, APP_GUARD, APP_INTERCEPTOR, APP_PIPE } from '@nestjs/core';
@@ -5,7 +6,6 @@ import { ScheduleModule, SchedulerRegistry } from '@nestjs/schedule';
 import { ClsModule } from 'nestjs-cls';
 import { KyselyModule } from 'nestjs-kysely';
 import { OpenTelemetryModule } from 'nestjs-otel';
-import { OrchestrationApiModule } from '@futo-org/backups-orchestrator-api/dist';
 import { ZodSerializerInterceptor, ZodValidationPipe } from 'nestjs-zod';
 import { commandsAndQuestions } from 'src/commands';
 import { IWorker } from 'src/constants';
@@ -61,7 +61,8 @@ const apiMiddleware = [
 
 const configRepository = new ConfigRepository();
 const { bull, cls, database, otel } = configRepository.getEnv();
-// TODO-DEV
+
+// TODO[YUCCA]: use IMMICH_ENV
 const isYuccaDevelopmentMode = true;
 
 const commonImports = [
@@ -116,11 +117,8 @@ export class BaseModule implements OnModuleInit, OnModuleDestroy {
     ...commonImports,
     ScheduleModule.forRoot(),
     OrchestrationApiModule.forRoot({
-      // TODO: db init must happen elsewhere...
-
-      yuccaProductionApi: 'https://staging.fubar.computer',
-      // yuccaProductionApi: 'http://100.64.0.6:5173', // TODO
-      statePath: '/data/yucca', // TODO
+      yuccaProductionApi: 'https://staging.fubar.computer', // TODO[YUCCA]: load from futo.cloud -> .well-known file
+      statePath: '/data/yucca', // TODO[YUCCA]: point to {immich_data_location}/yucca
       requireWsAuth: true,
       requireLock: true,
       developmentMode: isYuccaDevelopmentMode,
@@ -135,9 +133,8 @@ export class ApiModule extends BaseModule {}
   imports: [
     ...commonImports,
     OrchestrationApiModule.forRoot({
-      yuccaProductionApi: 'https://staging.fubar.computer',
-      // yuccaProductionApi: 'http://100.64.0.6:5173', // TODO
-      statePath: '/data/yucca', // TODO
+      yuccaProductionApi: 'https://staging.fubar.computer', // TODO[YUCCA]: load from futo.cloud -> .well-known file
+      statePath: '/data/yucca', // TODO[YUCCA]: point to {immich_data_location}/yucca
       externalBaseUrl: 'https://my.immich.app',
       requireWsAuth: true,
       requireLock: true,
diff --git a/web/src/lib/components/shared-components/navigation-bar/NavigationBar.svelte b/web/src/lib/components/shared-components/navigation-bar/NavigationBar.svelte
index e191d31a92..3c3c0bc71a 100644
--- a/web/src/lib/components/shared-components/navigation-bar/NavigationBar.svelte
+++ b/web/src/lib/components/shared-components/navigation-bar/NavigationBar.svelte
@@ -113,7 +113,7 @@
           />
         {/if}
 
-        <!-- TODO-DEV -->
+        <!-- TODO[YUCCA]: remove this -->
         {#if authManager.user.isAdmin}
           <Button
             leadingIcon={mdiProgressWrench}