diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a777cca126..4d37acd827 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -213,7 +213,7 @@ jobs:
               --tag ghcr.io/oneuptime/mcp-server:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               --push .
             docker buildx build \
               --platform linux/amd64,linux/arm64 \
@@ -222,7 +222,7 @@ jobs:
               --tag ghcr.io/oneuptime/mcp-server:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               --push .
             echo "✅ Pushed Docker images to Docker Hub and GitHub Container Registry"
 
@@ -302,7 +302,7 @@ jobs:
               --tag ghcr.io/oneuptime/nginx:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./Nginx/Dockerfile \
@@ -312,7 +312,7 @@ jobs:
               --tag ghcr.io/oneuptime/nginx:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   e2e-docker-image-deploy:
@@ -384,7 +384,7 @@ jobs:
               --tag ghcr.io/oneuptime/e2e:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./E2E/Dockerfile \
@@ -394,7 +394,7 @@ jobs:
               --tag ghcr.io/oneuptime/e2e:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   isolated-vm-docker-image-deploy:
@@ -466,7 +466,7 @@ jobs:
               --tag ghcr.io/oneuptime/isolated-vm:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./IsolatedVM/Dockerfile \
@@ -476,7 +476,7 @@ jobs:
               --tag ghcr.io/oneuptime/isolated-vm:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   home-docker-image-deploy:
@@ -548,7 +548,7 @@ jobs:
               --tag ghcr.io/oneuptime/home:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./Home/Dockerfile \
@@ -558,7 +558,7 @@ jobs:
               --tag ghcr.io/oneuptime/home:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
           
             
@@ -633,7 +633,7 @@ jobs:
               --tag ghcr.io/oneuptime/test-server:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./TestServer/Dockerfile \
@@ -643,7 +643,7 @@ jobs:
               --tag ghcr.io/oneuptime/test-server:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   otel-collector-docker-image-deploy:
@@ -715,7 +715,7 @@ jobs:
               --tag ghcr.io/oneuptime/otel-collector:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./OTelCollector/Dockerfile \
@@ -725,7 +725,7 @@ jobs:
               --tag ghcr.io/oneuptime/otel-collector:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
 
@@ -799,7 +799,7 @@ jobs:
               --tag ghcr.io/oneuptime/status-page:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./StatusPage/Dockerfile \
@@ -809,7 +809,7 @@ jobs:
               --tag ghcr.io/oneuptime/status-page:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   test-docker-image-deploy:
@@ -881,7 +881,7 @@ jobs:
               --tag ghcr.io/oneuptime/test:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./Tests/Dockerfile \
@@ -891,7 +891,7 @@ jobs:
               --tag ghcr.io/oneuptime/test:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   probe-ingest-docker-image-deploy:
@@ -963,7 +963,7 @@ jobs:
               --tag ghcr.io/oneuptime/probe-ingest:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./ProbeIngest/Dockerfile \
@@ -973,7 +973,7 @@ jobs:
               --tag ghcr.io/oneuptime/probe-ingest:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   
@@ -1046,7 +1046,7 @@ jobs:
               --tag ghcr.io/oneuptime/server-monitor-ingest:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./ServerMonitorIngest/Dockerfile \
@@ -1056,7 +1056,7 @@ jobs:
               --tag ghcr.io/oneuptime/server-monitor-ingest:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
           
           
@@ -1130,7 +1130,7 @@ jobs:
               --tag ghcr.io/oneuptime/open-telemetry-ingest:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./OpenTelemetryIngest/Dockerfile \
@@ -1140,7 +1140,7 @@ jobs:
               --tag ghcr.io/oneuptime/open-telemetry-ingest:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
 
@@ -1213,7 +1213,7 @@ jobs:
               --tag ghcr.io/oneuptime/incoming-request-ingest:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./IncomingRequestIngest/Dockerfile \
@@ -1223,7 +1223,7 @@ jobs:
               --tag ghcr.io/oneuptime/incoming-request-ingest:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   fluent-ingest-docker-image-deploy:
@@ -1295,7 +1295,7 @@ jobs:
               --tag ghcr.io/oneuptime/fluent-ingest:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./FluentIngest/Dockerfile \
@@ -1305,7 +1305,7 @@ jobs:
               --tag ghcr.io/oneuptime/fluent-ingest:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   probe-docker-image-deploy:
@@ -1377,7 +1377,7 @@ jobs:
               --tag ghcr.io/oneuptime/probe:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./Probe/Dockerfile \
@@ -1387,7 +1387,7 @@ jobs:
               --tag ghcr.io/oneuptime/probe:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   admin-dashboard-docker-image-deploy:
@@ -1459,7 +1459,7 @@ jobs:
               --tag ghcr.io/oneuptime/admin-dashboard:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./AdminDashboard/Dockerfile \
@@ -1469,7 +1469,7 @@ jobs:
               --tag ghcr.io/oneuptime/admin-dashboard:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
 
@@ -1542,7 +1542,7 @@ jobs:
               --tag ghcr.io/oneuptime/dashboard:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./Dashboard/Dockerfile \
@@ -1552,7 +1552,7 @@ jobs:
               --tag ghcr.io/oneuptime/dashboard:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   app-docker-image-deploy:
@@ -1624,7 +1624,7 @@ jobs:
               --tag ghcr.io/oneuptime/app:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./App/Dockerfile \
@@ -1634,7 +1634,7 @@ jobs:
               --tag ghcr.io/oneuptime/app:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
 
@@ -1707,7 +1707,7 @@ jobs:
               --tag ghcr.io/oneuptime/copilot:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./Copilot/Dockerfile \
@@ -1717,7 +1717,7 @@ jobs:
               --tag ghcr.io/oneuptime/copilot:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   accounts-docker-image-deploy:
@@ -1789,7 +1789,7 @@ jobs:
               --tag ghcr.io/oneuptime/accounts:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./Accounts/Dockerfile \
@@ -1799,7 +1799,7 @@ jobs:
               --tag ghcr.io/oneuptime/accounts:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
 
@@ -1915,7 +1915,7 @@ jobs:
               --tag ghcr.io/oneuptime/llm:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               ./LLM
             docker buildx build \
               --file ./LLM/Dockerfile \
@@ -1925,7 +1925,7 @@ jobs:
               --tag ghcr.io/oneuptime/llm:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               ./LLM
         
   docs-docker-image-deploy: 
@@ -1999,7 +1999,7 @@ jobs:
               --tag ghcr.io/oneuptime/docs:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./Docs/Dockerfile \
@@ -2009,7 +2009,7 @@ jobs:
               --tag ghcr.io/oneuptime/docs:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
         
   
@@ -2086,7 +2086,7 @@ jobs:
               --tag ghcr.io/oneuptime/worker:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./Worker/Dockerfile \
@@ -2096,7 +2096,7 @@ jobs:
               --tag ghcr.io/oneuptime/worker:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
         
   
@@ -2173,7 +2173,7 @@ jobs:
               --tag ghcr.io/oneuptime/workflow:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./Workflow/Dockerfile \
@@ -2183,7 +2183,7 @@ jobs:
               --tag ghcr.io/oneuptime/workflow:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
             
   
@@ -2320,7 +2320,7 @@ jobs:
               --tag ghcr.io/oneuptime/api-reference:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./APIReference/Dockerfile \
@@ -2330,7 +2330,7 @@ jobs:
               --tag ghcr.io/oneuptime/api-reference:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   push-release-tags:
diff --git a/.github/workflows/test-release.yaml b/.github/workflows/test-release.yaml
index 95a50a96bd..c83feb2cb3 100644
--- a/.github/workflows/test-release.yaml
+++ b/.github/workflows/test-release.yaml
@@ -207,7 +207,7 @@ jobs:
               --tag ghcr.io/oneuptime/mcp-server:test \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               --push .
             docker buildx build \
               --platform linux/amd64,linux/arm64 \
@@ -218,7 +218,7 @@ jobs:
               --tag ghcr.io/oneuptime/mcp-server:enterprise-test \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               --push .
             echo "✅ Pushed test Docker images to Docker Hub and GitHub Container Registry"
 
@@ -325,7 +325,7 @@ jobs:
               --tag ghcr.io/oneuptime/llm:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               ./LLM
             docker buildx build \
               --file ./LLM/Dockerfile \
@@ -337,7 +337,7 @@ jobs:
               --tag ghcr.io/oneuptime/llm:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               ./LLM
 
 
@@ -413,7 +413,7 @@ jobs:
               --tag ghcr.io/oneuptime/nginx:${VERSION} \
               --build-arg APP_VERSION=${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./Nginx/Dockerfile \
@@ -425,7 +425,7 @@ jobs:
               --tag ghcr.io/oneuptime/nginx:enterprise-${VERSION} \
               --build-arg APP_VERSION=${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
 
@@ -501,7 +501,7 @@ jobs:
               --tag ghcr.io/oneuptime/e2e:${VERSION} \
               --build-arg APP_VERSION=${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./E2E/Dockerfile \
@@ -513,7 +513,7 @@ jobs:
               --tag ghcr.io/oneuptime/e2e:enterprise-${VERSION} \
               --build-arg APP_VERSION=${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   test-server-docker-image-deploy:
@@ -588,7 +588,7 @@ jobs:
               --tag ghcr.io/oneuptime/test-server:${VERSION} \
               --build-arg APP_VERSION=${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./TestServer/Dockerfile \
@@ -600,7 +600,7 @@ jobs:
               --tag ghcr.io/oneuptime/test-server:enterprise-${VERSION} \
               --build-arg APP_VERSION=${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   otel-collector-docker-image-deploy:
@@ -675,7 +675,7 @@ jobs:
               --tag ghcr.io/oneuptime/otel-collector:${VERSION} \
               --build-arg APP_VERSION=${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./OTelCollector/Dockerfile \
@@ -687,7 +687,7 @@ jobs:
               --tag ghcr.io/oneuptime/otel-collector:enterprise-${VERSION} \
               --build-arg APP_VERSION=${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   isolated-vm-docker-image-deploy:
@@ -762,7 +762,7 @@ jobs:
               --tag ghcr.io/oneuptime/isolated-vm:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./IsolatedVM/Dockerfile \
@@ -774,7 +774,7 @@ jobs:
               --tag ghcr.io/oneuptime/isolated-vm:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   home-docker-image-deploy:
@@ -849,7 +849,7 @@ jobs:
               --tag ghcr.io/oneuptime/home:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./Home/Dockerfile \
@@ -861,7 +861,7 @@ jobs:
               --tag ghcr.io/oneuptime/home:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   
@@ -938,7 +938,7 @@ jobs:
               --tag ghcr.io/oneuptime/status-page:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./StatusPage/Dockerfile \
@@ -950,7 +950,7 @@ jobs:
               --tag ghcr.io/oneuptime/status-page:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
 
@@ -1027,7 +1027,7 @@ jobs:
               --tag ghcr.io/oneuptime/test:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./Tests/Dockerfile \
@@ -1039,7 +1039,7 @@ jobs:
               --tag ghcr.io/oneuptime/test:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   probe-ingest-docker-image-deploy:
@@ -1114,7 +1114,7 @@ jobs:
               --tag ghcr.io/oneuptime/probe-ingest:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./ProbeIngest/Dockerfile \
@@ -1126,7 +1126,7 @@ jobs:
               --tag ghcr.io/oneuptime/probe-ingest:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
 
@@ -1203,7 +1203,7 @@ jobs:
               --tag ghcr.io/oneuptime/server-monitor-ingest:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./ServerMonitorIngest/Dockerfile \
@@ -1215,7 +1215,7 @@ jobs:
               --tag ghcr.io/oneuptime/server-monitor-ingest:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
           
             
@@ -1293,7 +1293,7 @@ jobs:
               --tag ghcr.io/oneuptime/incoming-request-ingest:${VERSION} \
               --build-arg APP_VERSION=${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./IncomingRequestIngest/Dockerfile \
@@ -1305,7 +1305,7 @@ jobs:
               --tag ghcr.io/oneuptime/incoming-request-ingest:enterprise-${VERSION} \
               --build-arg APP_VERSION=${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   open-telemetry-ingest-docker-image-deploy:
@@ -1380,7 +1380,7 @@ jobs:
               --tag ghcr.io/oneuptime/open-telemetry-ingest:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./OpenTelemetryIngest/Dockerfile \
@@ -1392,7 +1392,7 @@ jobs:
               --tag ghcr.io/oneuptime/open-telemetry-ingest:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   fluent-ingest-docker-image-deploy:
@@ -1467,7 +1467,7 @@ jobs:
               --tag ghcr.io/oneuptime/fluent-ingest:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./FluentIngest/Dockerfile \
@@ -1479,7 +1479,7 @@ jobs:
               --tag ghcr.io/oneuptime/fluent-ingest:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   probe-docker-image-deploy:
@@ -1554,7 +1554,7 @@ jobs:
               --tag ghcr.io/oneuptime/probe:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./Probe/Dockerfile \
@@ -1566,7 +1566,7 @@ jobs:
               --tag ghcr.io/oneuptime/probe:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   dashboard-docker-image-deploy:
@@ -1641,7 +1641,7 @@ jobs:
               --tag ghcr.io/oneuptime/dashboard:${VERSION} \
               --build-arg APP_VERSION=${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./Dashboard/Dockerfile \
@@ -1653,7 +1653,7 @@ jobs:
               --tag ghcr.io/oneuptime/dashboard:enterprise-${VERSION} \
               --build-arg APP_VERSION=${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   admin-dashboard-docker-image-deploy:
@@ -1728,7 +1728,7 @@ jobs:
               --tag ghcr.io/oneuptime/admin-dashboard:${VERSION} \
               --build-arg APP_VERSION=${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./AdminDashboard/Dockerfile \
@@ -1740,7 +1740,7 @@ jobs:
               --tag ghcr.io/oneuptime/admin-dashboard:enterprise-${VERSION} \
               --build-arg APP_VERSION=${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   app-docker-image-deploy:
@@ -1815,7 +1815,7 @@ jobs:
               --tag ghcr.io/oneuptime/app:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./App/Dockerfile \
@@ -1827,7 +1827,7 @@ jobs:
               --tag ghcr.io/oneuptime/app:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   
@@ -1905,7 +1905,7 @@ jobs:
               --tag ghcr.io/oneuptime/api-reference:${VERSION} \
               --build-arg APP_VERSION=${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./APIReference/Dockerfile \
@@ -1917,7 +1917,7 @@ jobs:
               --tag ghcr.io/oneuptime/api-reference:enterprise-${VERSION} \
               --build-arg APP_VERSION=${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   
@@ -1994,7 +1994,7 @@ jobs:
               --tag ghcr.io/oneuptime/accounts:${VERSION} \
               --build-arg APP_VERSION=${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./Accounts/Dockerfile \
@@ -2006,7 +2006,7 @@ jobs:
               --tag ghcr.io/oneuptime/accounts:enterprise-${VERSION} \
               --build-arg APP_VERSION=${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   worker-docker-image-deploy:
@@ -2081,7 +2081,7 @@ jobs:
                 --tag ghcr.io/oneuptime/mcp-server:test \
                 --build-arg GIT_SHA=${{ github.sha }} \
                 --build-arg APP_VERSION=${VERSION} \
-                --build-arg IS_ENTERPRISE=false \
+                --build-arg IS_ENTERPRISE_EDITION=false \
                 .
               docker buildx build \
                 --file ./MCP/Dockerfile.tpl \
@@ -2093,7 +2093,7 @@ jobs:
                 --tag ghcr.io/oneuptime/mcp-server:enterprise-${VERSION} \
                 --build-arg GIT_SHA=${{ github.sha }} \
                 --build-arg APP_VERSION=${VERSION} \
-                --build-arg IS_ENTERPRISE=true \
+                --build-arg IS_ENTERPRISE_EDITION=true \
                 .
 
   copilot-docker-image-deploy:
@@ -2168,7 +2168,7 @@ jobs:
               --tag ghcr.io/oneuptime/copilot:${VERSION} \
               --build-arg APP_VERSION=${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./Copilot/Dockerfile \
@@ -2180,7 +2180,7 @@ jobs:
               --tag ghcr.io/oneuptime/copilot:enterprise-${VERSION} \
               --build-arg APP_VERSION=${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
   
@@ -2256,7 +2256,7 @@ jobs:
               --tag ghcr.io/oneuptime/workflow:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./Workflow/Dockerfile \
@@ -2268,7 +2268,7 @@ jobs:
               --tag ghcr.io/oneuptime/workflow:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
 
     
@@ -2344,7 +2344,7 @@ jobs:
               --tag ghcr.io/oneuptime/docs:${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=false \
+              --build-arg IS_ENTERPRISE_EDITION=false \
               .
             docker buildx build \
               --file ./Docs/Dockerfile \
@@ -2356,7 +2356,7 @@ jobs:
               --tag ghcr.io/oneuptime/docs:enterprise-${VERSION} \
               --build-arg GIT_SHA=${{ github.sha }} \
               --build-arg APP_VERSION=${VERSION} \
-              --build-arg IS_ENTERPRISE=true \
+              --build-arg IS_ENTERPRISE_EDITION=true \
               .
           
               
diff --git a/APIReference/Dockerfile.tpl b/APIReference/Dockerfile.tpl
index 8f306fda1e..d8a1e635c7 100644
--- a/APIReference/Dockerfile.tpl
+++ b/APIReference/Dockerfile.tpl
@@ -14,11 +14,11 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE=false
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 
 
diff --git a/Accounts/Dockerfile.tpl b/Accounts/Dockerfile.tpl
index 7f2a560f81..ce9cf7f072 100644
--- a/Accounts/Dockerfile.tpl
+++ b/Accounts/Dockerfile.tpl
@@ -14,11 +14,11 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE=false
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 
 
diff --git a/AdminDashboard/Dockerfile.tpl b/AdminDashboard/Dockerfile.tpl
index f9afce727b..444cde7d55 100644
--- a/AdminDashboard/Dockerfile.tpl
+++ b/AdminDashboard/Dockerfile.tpl
@@ -14,11 +14,11 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE=false
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 
 
diff --git a/App/Dockerfile.tpl b/App/Dockerfile.tpl
index de816bc6ca..657b494934 100644
--- a/App/Dockerfile.tpl
+++ b/App/Dockerfile.tpl
@@ -14,11 +14,11 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE=false
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 
 
diff --git a/Common/UI/Components/EditionLabel/EditionLabel.tsx b/Common/UI/Components/EditionLabel/EditionLabel.tsx
index 5a0ef2e1f4..faa25f6cf1 100644
--- a/Common/UI/Components/EditionLabel/EditionLabel.tsx
+++ b/Common/UI/Components/EditionLabel/EditionLabel.tsx
@@ -7,7 +7,7 @@ import React, {
   useMemo,
   useState,
 } from "react";
-import { BILLING_ENABLED, IS_ENTERPRISE } from "../../Config";
+import { BILLING_ENABLED, IS_ENTERPRISE_EDITION } from "../../Config";
 
 export interface ComponentProps {
   className?: string | undefined;
@@ -24,15 +24,15 @@ const EditionLabel: FunctionComponent<ComponentProps> = (
     return <></>;
   }
 
-  const editionName: string = IS_ENTERPRISE
+  const editionName: string = IS_ENTERPRISE_EDITION
     ? "Enterprise Edition"
     : "Community Edition";
 
-  const indicatorColor: string = IS_ENTERPRISE
+  const indicatorColor: string = IS_ENTERPRISE_EDITION
     ? "bg-emerald-500"
     : "bg-indigo-400";
 
-  const ctaLabel: string = IS_ENTERPRISE ? "View benefits" : "Learn more";
+  const ctaLabel: string = IS_ENTERPRISE_EDITION ? "View benefits" : "Learn more";
 
   const communityFeatures: Array<string> = useMemo(() => {
     return [
@@ -93,14 +93,14 @@ const EditionLabel: FunctionComponent<ComponentProps> = (
       {isDialogOpen && (
         <Modal
           title={editionName}
-          submitButtonText={IS_ENTERPRISE ? "Learn More" : "Talk to Sales"}
+          submitButtonText={IS_ENTERPRISE_EDITION ? "Learn More" : "Talk to Sales"}
           closeButtonText="Close"
           onClose={closeDialog}
           onSubmit={handlePrimaryAction}
           modalWidth={ModalWidth.Large}
         >
           <div className="space-y-3 text-sm text-gray-600">
-            {IS_ENTERPRISE ? (
+            {IS_ENTERPRISE_EDITION ? (
               <>
                 <p>
                   You are running the Enterprise Edition of OneUptime. This
diff --git a/Common/UI/Config.ts b/Common/UI/Config.ts
index 00c6fffc08..fd86922333 100644
--- a/Common/UI/Config.ts
+++ b/Common/UI/Config.ts
@@ -48,7 +48,7 @@ export const HTTP_PROTOCOL: Protocol =
 export const HOST: string = env("HOST") || "";
 
 export const BILLING_ENABLED: boolean = env("BILLING_ENABLED") === "true";
-export const IS_ENTERPRISE: boolean = env("IS_ENTERPRISE") === "true";
+export const IS_ENTERPRISE_EDITION: boolean = env("IS_ENTERPRISE_EDITION") === "true";
 export const BILLING_PUBLIC_KEY: string = env("BILLING_PUBLIC_KEY") || "";
 
 // VAPID Configuration for Push Notifications
diff --git a/Copilot/Dockerfile.tpl b/Copilot/Dockerfile.tpl
index e9865cb44d..207a850fe2 100644
--- a/Copilot/Dockerfile.tpl
+++ b/Copilot/Dockerfile.tpl
@@ -13,11 +13,11 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE=false
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 
 
diff --git a/Dashboard/Dockerfile.tpl b/Dashboard/Dockerfile.tpl
index 744aaac3a8..2be61baed5 100644
--- a/Dashboard/Dockerfile.tpl
+++ b/Dashboard/Dockerfile.tpl
@@ -14,11 +14,11 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE=false
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 
 
diff --git a/Docs/Dockerfile.tpl b/Docs/Dockerfile.tpl
index b58bde85d2..04f93b0d15 100644
--- a/Docs/Dockerfile.tpl
+++ b/Docs/Dockerfile.tpl
@@ -14,11 +14,11 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE=false
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 
 
diff --git a/E2E/Dockerfile.tpl b/E2E/Dockerfile.tpl
index 387b4b5db4..ba69dce331 100644
--- a/E2E/Dockerfile.tpl
+++ b/E2E/Dockerfile.tpl
@@ -16,11 +16,11 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE=false
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 
 # IF APP_VERSION is not set, set it to 1.0.0
 RUN if [ -z "$APP_VERSION" ]; then export APP_VERSION=1.0.0; fi
diff --git a/FluentBit/Dockerfile.tpl b/FluentBit/Dockerfile.tpl
index a1e948ffe9..ff367550fe 100644
--- a/FluentBit/Dockerfile.tpl
+++ b/FluentBit/Dockerfile.tpl
@@ -1,7 +1,7 @@
 FROM cr.fluentbit.io/fluent/fluent-bit
 
-ARG IS_ENTERPRISE=false
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ARG IS_ENTERPRISE_EDITION=false
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 
 # This container will only run in dev env, so this is ok.
 USER root
diff --git a/FluentIngest/Dockerfile.tpl b/FluentIngest/Dockerfile.tpl
index 27a985f99b..b2f30f8baf 100644
--- a/FluentIngest/Dockerfile.tpl
+++ b/FluentIngest/Dockerfile.tpl
@@ -13,11 +13,11 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE=false
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 ENV NODE_OPTIONS="--use-openssl-ca"
 
diff --git a/Fluentd/Dockerfile.tpl b/Fluentd/Dockerfile.tpl
index ca6ad91b27..d9f18b6bea 100644
--- a/Fluentd/Dockerfile.tpl
+++ b/Fluentd/Dockerfile.tpl
@@ -1,7 +1,7 @@
 FROM fluentd
 
-ARG IS_ENTERPRISE=false
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ARG IS_ENTERPRISE_EDITION=false
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 
 # This container will only run in dev env, so this is ok.
 USER root
diff --git a/Home/Dockerfile.tpl b/Home/Dockerfile.tpl
index d1f381ba2b..db953cbeb7 100644
--- a/Home/Dockerfile.tpl
+++ b/Home/Dockerfile.tpl
@@ -12,11 +12,11 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE=false
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 
 # IF APP_VERSION is not set, set it to 1.0.0
diff --git a/IncomingRequestIngest/Dockerfile.tpl b/IncomingRequestIngest/Dockerfile.tpl
index efbd781714..27f1327876 100644
--- a/IncomingRequestIngest/Dockerfile.tpl
+++ b/IncomingRequestIngest/Dockerfile.tpl
@@ -13,11 +13,11 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE=false
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 ENV NODE_OPTIONS="--use-openssl-ca"
 
diff --git a/IsolatedVM/Dockerfile.tpl b/IsolatedVM/Dockerfile.tpl
index 3eb12136a8..a8ff9301e0 100644
--- a/IsolatedVM/Dockerfile.tpl
+++ b/IsolatedVM/Dockerfile.tpl
@@ -14,11 +14,11 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE=false
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 
 
 # IF APP_VERSION is not set, set it to 1.0.0
diff --git a/LLM/Dockerfile.tpl b/LLM/Dockerfile.tpl
index 1a4f1a04d3..445422cc1d 100644
--- a/LLM/Dockerfile.tpl
+++ b/LLM/Dockerfile.tpl
@@ -1,8 +1,8 @@
 # Use an official Python runtime as a parent image
 FROM huggingface/transformers-pytorch-gpu:latest
 
-ARG IS_ENTERPRISE=false
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ARG IS_ENTERPRISE_EDITION=false
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 
 # Set the working directory in the container to /app
 WORKDIR /app
diff --git a/MCP/Dockerfile.tpl b/MCP/Dockerfile.tpl
index 963971fd1f..d4f4d19f99 100644
--- a/MCP/Dockerfile.tpl
+++ b/MCP/Dockerfile.tpl
@@ -12,11 +12,11 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE=false
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 
 # IF APP_VERSION is not set, set it to 1.0.0
diff --git a/Nginx/Dockerfile.tpl b/Nginx/Dockerfile.tpl
index fbcb6eb3a9..5daea1b955 100644
--- a/Nginx/Dockerfile.tpl
+++ b/Nginx/Dockerfile.tpl
@@ -3,11 +3,11 @@ FROM nginx:1.29.2-alpine
 
 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE=false
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 
 
diff --git a/OTelCollector/Dockerfile.tpl b/OTelCollector/Dockerfile.tpl
index 77f3a90618..0cf1c785b2 100644
--- a/OTelCollector/Dockerfile.tpl
+++ b/OTelCollector/Dockerfile.tpl
@@ -4,8 +4,8 @@ FROM otel/opentelemetry-collector-contrib:0.118.0
 
 FROM public.ecr.aws/ubuntu/ubuntu:25.04
 
-ARG IS_ENTERPRISE=false
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ARG IS_ENTERPRISE_EDITION=false
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 
 ENV COLLECTOR_VERSION=0.104.0
 
diff --git a/OpenTelemetryIngest/Dockerfile.tpl b/OpenTelemetryIngest/Dockerfile.tpl
index 42b567fa6b..20a4d035e5 100644
--- a/OpenTelemetryIngest/Dockerfile.tpl
+++ b/OpenTelemetryIngest/Dockerfile.tpl
@@ -13,11 +13,11 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE=false
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 ENV NODE_OPTIONS="--use-openssl-ca"
 
diff --git a/Probe/Dockerfile.tpl b/Probe/Dockerfile.tpl
index c781455ff4..0b5d320a18 100644
--- a/Probe/Dockerfile.tpl
+++ b/Probe/Dockerfile.tpl
@@ -13,11 +13,11 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE=false
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 ENV NODE_OPTIONS="--use-openssl-ca"
 
 ## Add Intermediate Certs 
diff --git a/ProbeIngest/Dockerfile.tpl b/ProbeIngest/Dockerfile.tpl
index d86a7a5908..98bedc7ac1 100644
--- a/ProbeIngest/Dockerfile.tpl
+++ b/ProbeIngest/Dockerfile.tpl
@@ -13,11 +13,11 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE=false
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 ENV NODE_OPTIONS="--use-openssl-ca"
 
 ## Add Intermediate Certs 
diff --git a/ServerMonitorIngest/Dockerfile.tpl b/ServerMonitorIngest/Dockerfile.tpl
index dd04b82449..6ec5b30c5b 100644
--- a/ServerMonitorIngest/Dockerfile.tpl
+++ b/ServerMonitorIngest/Dockerfile.tpl
@@ -13,11 +13,11 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE=false
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 ENV NODE_OPTIONS="--use-openssl-ca"
 
diff --git a/StatusPage/Dockerfile.tpl b/StatusPage/Dockerfile.tpl
index ea99fabf66..767c1e21bb 100644
--- a/StatusPage/Dockerfile.tpl
+++ b/StatusPage/Dockerfile.tpl
@@ -14,11 +14,11 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE=false
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 
 
diff --git a/TestServer/Dockerfile.tpl b/TestServer/Dockerfile.tpl
index 159360eda9..ee440227a5 100644
--- a/TestServer/Dockerfile.tpl
+++ b/TestServer/Dockerfile.tpl
@@ -13,11 +13,11 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE=false
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 
 
diff --git a/Tests/Dockerfile.tpl b/Tests/Dockerfile.tpl
index 5f6d3553bd..f1bf2fcca4 100644
--- a/Tests/Dockerfile.tpl
+++ b/Tests/Dockerfile.tpl
@@ -12,11 +12,11 @@ RUN apk add bash && apk add curl
 
 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE=false
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 
 
diff --git a/Worker/Dockerfile.tpl b/Worker/Dockerfile.tpl
index 78a26847e0..ffcf2c1703 100644
--- a/Worker/Dockerfile.tpl
+++ b/Worker/Dockerfile.tpl
@@ -12,11 +12,11 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE=false
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 
 # IF APP_VERSION is not set, set it to 1.0.0
diff --git a/Workflow/Dockerfile.tpl b/Workflow/Dockerfile.tpl
index f3b6f10591..14fd33059b 100644
--- a/Workflow/Dockerfile.tpl
+++ b/Workflow/Dockerfile.tpl
@@ -12,11 +12,11 @@ RUN npm config set fetch-retry-maxtimeout 600000
 
 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE=false
+ARG IS_ENTERPRISE_EDITION=false
 
 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE=${IS_ENTERPRISE}
+ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
 ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 
 # IF APP_VERSION is not set, set it to 1.0.0
diff --git a/config.example.env b/config.example.env
index 524d281a46..1740aec0fc 100644
--- a/config.example.env
+++ b/config.example.env
@@ -53,7 +53,7 @@ ENVIRONMENT=production
 APP_TAG=release
 
 # Change this to true if you are using enterprise edition. Keep it false if you are using community edition.
-IS_ENTERPRISE=false
+IS_ENTERPRISE_EDITION=false
 
 # What is the name of the docker compose project. This is used to prefix the docker containers.
 COMPOSE_PROJECT_NAME=oneuptime
diff --git a/docker-compose.base.yml b/docker-compose.base.yml
index 363e27c156..6bd065eaa3 100644
--- a/docker-compose.base.yml
+++ b/docker-compose.base.yml
@@ -14,7 +14,7 @@ x-common-variables: &common-variables
 
     NODE_ENV: ${ENVIRONMENT}
     BILLING_ENABLED: ${BILLING_ENABLED}
-    IS_ENTERPRISE: ${IS_ENTERPRISE}
+    IS_ENTERPRISE_EDITION: ${IS_ENTERPRISE_EDITION}
     BILLING_PUBLIC_KEY: ${BILLING_PUBLIC_KEY}
     SUBSCRIPTION_PLAN_BASIC: ${SUBSCRIPTION_PLAN_BASIC}
     SUBSCRIPTION_PLAN_GROWTH: ${SUBSCRIPTION_PLAN_GROWTH}
@@ -445,7 +445,7 @@ services:
             PORT: ${ISOLATED_VM_PORT}
             ONEUPTIME_SECRET: ${ONEUPTIME_SECRET}
             DISABLE_TELEMETRY: ${DISABLE_TELEMETRY_FOR_ISOLATED_VM}
-            IS_ENTERPRISE: ${IS_ENTERPRISE}
+            IS_ENTERPRISE_EDITION: ${IS_ENTERPRISE_EDITION}
         logging:
             driver: "local"
             options:
@@ -535,7 +535,7 @@ services:
             DISABLE_COPILOT: ${DISABLE_COPILOT}
             OPENAI_API_KEY: ${COPILOT_OPENAI_API_KEY}
             LOG_LEVEL: ${LOG_LEVEL}
-            IS_ENTERPRISE: ${IS_ENTERPRISE}
+            IS_ENTERPRISE_EDITION: ${IS_ENTERPRISE_EDITION}
         logging:
             driver: "local"
             options: