diff --git a/.circleci/config.yml b/.circleci/config.yml
index 790efc79862..8ea0b6b633e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3861,31 +3861,9 @@ jobs:
           name: Install Playwright Browsers
           command: |
             npx playwright install
-      - run:
-          name: Install Neon CLI
-          command: |
-            npm i -g neonctl
-      - run:
-          name: Create Neon branch
-          command: |
-            export EXPIRES_AT=$(date -u -d "+3 hours" +"%Y-%m-%dT%H:%M:%SZ")
-            echo "Expires at: $EXPIRES_AT"
-            neon branches create \
-              --project-id $NEON_PROJECT_ID \
-              --name preview/commit-${CIRCLE_SHA1:0:7}-<< parameters.browser >> \
-              --expires-at $EXPIRES_AT \
-              --parent br-fancy-paper-ad1olsb3 \
-              --api-key $NEON_API_KEY || true
       - run:
           name: Run Docker container
           command: |
-            E2E_UI_TEST_DATABASE_URL=$(neon connection-string \
-              --project-id $NEON_PROJECT_ID \
-              --api-key $NEON_API_KEY \
-              --branch preview/commit-${CIRCLE_SHA1:0:7}-<< parameters.browser >> \
-              --database-name yuneng-trial-db \
-              --role neondb_owner)
-            echo $E2E_UI_TEST_DATABASE_URL
             docker run -d \
               -p 4000:4000 \
               -e DATABASE_URL=$E2E_UI_TEST_DATABASE_URL \
@@ -4178,32 +4156,32 @@ workflows:
               only:
                 - main
                 - /litellm_.*/
-      - e2e_ui_testing:
-          name: e2e_ui_testing_chromium
-          browser: chromium
-          context: e2e_ui_tests
-          requires:
-            - ui_build
-            - build_docker_database_image
-            - prisma_schema_sync
-          filters:
-            branches:
-              only:
-                - main
-                - /litellm_.*/
-      - e2e_ui_testing:
-          name: e2e_ui_testing_firefox
-          browser: firefox
-          context: e2e_ui_tests
-          requires:
-            - ui_build
-            - build_docker_database_image
-            - prisma_schema_sync
-          filters:
-            branches:
-              only:
-                - main
-                - /litellm_.*/
+      # - e2e_ui_testing:
+      #     name: e2e_ui_testing_chromium
+      #     browser: chromium
+      #     context: e2e_ui_tests
+      #     requires:
+      #       - ui_build
+      #       - build_docker_database_image
+      #       - prisma_schema_sync
+      #     filters:
+      #       branches:
+      #         only:
+      #           - main
+      #           - /litellm_.*/
+      # - e2e_ui_testing:
+      #     name: e2e_ui_testing_firefox
+      #     browser: firefox
+      #     context: e2e_ui_tests
+      #     requires:
+      #       - ui_build
+      #       - build_docker_database_image
+      #       - prisma_schema_sync
+      #     filters:
+      #       branches:
+      #         only:
+      #           - main
+      #           - /litellm_.*/
       - build_and_test:
           requires:
             - build_docker_database_image
diff --git a/docker/Dockerfile.non_root b/docker/Dockerfile.non_root
index ea360a3e1b1..d00d34c88ac 100644
--- a/docker/Dockerfile.non_root
+++ b/docker/Dockerfile.non_root
@@ -42,7 +42,11 @@ ENV LITELLM_NON_ROOT=true
 
 # Build Admin UI using the upstream command order while keeping a single RUN layer
 RUN mkdir -p /var/lib/litellm/ui && \
-    npm install -g npm@latest && npm cache clean --force && \
+    mv /app/.npmrc /app/.npmrc.bak && \
+    npm install -g npm@11.12.1 && \
+    npm install -g node-gyp@12.2.0 && \
+    ln -sf /usr/local/lib/node_modules/node-gyp /usr/lib/node_modules/npm/node_modules/node-gyp && \
+    npm cache clean --force && \
     cd /app/ui/litellm-dashboard && \
     if [ -f "/app/enterprise/enterprise_ui/enterprise_colors.json" ]; then \
       cp /app/enterprise/enterprise_ui/enterprise_colors.json ./ui_colors.json; \
@@ -133,9 +137,6 @@ COPY --from=builder /app/requirements.txt /app/requirements.txt
 COPY --from=builder /app/docker/entrypoint.sh /app/docker/prod_entrypoint.sh /app/docker/
 COPY --from=builder /app/docker/supervisord.conf /etc/supervisord.conf
 COPY --from=builder /app/schema.prisma /app/
-# Keep enterprise bridge module in runtime so `enterprise.enterprise_hooks`
-# can load and register managed enterprise hooks (e.g. managed_files).
-COPY --from=builder /app/enterprise /app/enterprise
 # Copy prisma_migration.py for Helm migrations job compatibility
 COPY --from=builder /app/litellm/proxy/prisma_migration.py /app/litellm/proxy/prisma_migration.py
 COPY --from=builder /wheels/ /wheels/