diff --git a/api/src/unraid-api/graph/resolvers/docker/docker-config.service.ts b/api/src/unraid-api/graph/resolvers/docker/docker-config.service.ts
index eb3eecd58..1ed27212f 100644
--- a/api/src/unraid-api/graph/resolvers/docker/docker-config.service.ts
+++ b/api/src/unraid-api/graph/resolvers/docker/docker-config.service.ts
@@ -5,8 +5,8 @@ import { CronExpression } from '@nestjs/schedule';
 import { ConfigFilePersister } from '@unraid/shared/services/config-file.js';
 import { validateCronExpression } from 'cron';
 
+import { FeatureFlags } from '@app/consts.js';
 import { AppError } from '@app/core/errors/app-error.js';
-import { ENABLE_NEXT_DOCKER_RELEASE } from '@app/environment.js';
 import { DockerConfig } from '@app/unraid-api/graph/resolvers/docker/docker-config.model.js';
 import { validateObject } from '@app/unraid-api/graph/resolvers/validation.utils.js';
 
@@ -17,7 +17,7 @@ export class DockerConfigService extends ConfigFilePersister<DockerConfig> {
     }
 
     enabled(): boolean {
-        return ENABLE_NEXT_DOCKER_RELEASE;
+        return FeatureFlags.ENABLE_NEXT_DOCKER_RELEASE;
     }
 
     configKey(): string {
diff --git a/api/src/unraid-api/graph/resolvers/docker/organizer/docker-organizer-config.service.ts b/api/src/unraid-api/graph/resolvers/docker/organizer/docker-organizer-config.service.ts
index 288edcf53..f627ee88d 100644
--- a/api/src/unraid-api/graph/resolvers/docker/organizer/docker-organizer-config.service.ts
+++ b/api/src/unraid-api/graph/resolvers/docker/organizer/docker-organizer-config.service.ts
@@ -3,8 +3,8 @@ import { ConfigService } from '@nestjs/config';
 
 import { ConfigFilePersister } from '@unraid/shared/services/config-file.js';
 
+import { FeatureFlags } from '@app/consts.js';
 import { AppError } from '@app/core/errors/app-error.js';
-import { ENABLE_NEXT_DOCKER_RELEASE } from '@app/environment.js';
 import { validateObject } from '@app/unraid-api/graph/resolvers/validation.utils.js';
 import {
     DEFAULT_ORGANIZER_ROOT_ID,
@@ -20,7 +20,7 @@ export class DockerOrganizerConfigService extends ConfigFilePersister<OrganizerV
     }
 
     enabled(): boolean {
-        return ENABLE_NEXT_DOCKER_RELEASE;
+        return FeatureFlags.ENABLE_NEXT_DOCKER_RELEASE;
     }
 
     configKey(): string {