diff --git a/app/react/kubernetes/helm/helmChartSourceQueries/useHelmRepositories.ts b/app/react/kubernetes/helm/helmChartSourceQueries/useHelmRepositories.ts
index 4a38a6644..981ea7932 100644
--- a/app/react/kubernetes/helm/helmChartSourceQueries/useHelmRepositories.ts
+++ b/app/react/kubernetes/helm/helmChartSourceQueries/useHelmRepositories.ts
@@ -51,17 +51,6 @@ export function useHelmRepoOptions() {
           label: 'Helm Repositories',
           options: repoOptions,
         },
-        {
-          label: 'OCI Registries',
-          options: [
-            {
-              label:
-                'Installing from an OCI registry is a Portainer Business Feature',
-              value: {},
-              disabled: true,
-            },
-          ],
-        },
       ];
     },
   });
diff --git a/app/react/portainer/settings/EdgeComputeView/AutomaticEdgeEnvCreation/AutoEnvCreationSettingsForm.tsx b/app/react/portainer/settings/EdgeComputeView/AutomaticEdgeEnvCreation/AutoEnvCreationSettingsForm.tsx
deleted file mode 100644
index b75c5ea13..000000000
--- a/app/react/portainer/settings/EdgeComputeView/AutomaticEdgeEnvCreation/AutoEnvCreationSettingsForm.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import { Form, Formik } from 'formik';
-import * as yup from 'yup';
-import { useCallback } from 'react';
-
-import { notifySuccess } from '@/portainer/services/notifications';
-import { useUpdateSettingsMutation } from '@/react/portainer/settings/queries';
-import { Settings } from '@/react/portainer/settings/types';
-
-import { LoadingButton } from '@@/buttons/LoadingButton';
-
-import { EnabledWaitingRoomSwitch } from './EnableWaitingRoomSwitch';
-
-interface FormValues {
-  EnableWaitingRoom: boolean;
-}
-const validation = yup.object({
-  EnableWaitingRoom: yup.boolean(),
-});
-
-interface Props {
-  settings: Settings;
-}
-
-export function AutoEnvCreationSettingsForm({ settings }: Props) {
-  const initialValues: FormValues = {
-    EnableWaitingRoom: !settings.TrustOnFirstConnect,
-  };
-
-  const mutation = useUpdateSettingsMutation();
-
-  const { mutate: updateSettings } = mutation;
-
-  const handleSubmit = useCallback(
-    (variables: Partial<FormValues>) => {
-      updateSettings(
-        { TrustOnFirstConnect: !variables.EnableWaitingRoom },
-        {
-          onSuccess() {
-            notifySuccess(
-              'Success',
-              'Successfully updated Automatic Environment Creation settings'
-            );
-          },
-        }
-      );
-    },
-    [updateSettings]
-  );
-
-  return (
-    <Formik<FormValues>
-      initialValues={initialValues}
-      onSubmit={handleSubmit}
-      validationSchema={validation}
-      validateOnMount
-      enableReinitialize
-    >
-      {({ isValid, dirty }) => (
-        <Form className="form-horizontal">
-          <EnabledWaitingRoomSwitch />
-
-          <div className="form-group">
-            <div className="col-sm-12">
-              <LoadingButton
-                loadingText="generating..."
-                data-cy="save-auto-env-settings-button"
-                isLoading={mutation.isLoading}
-                disabled={!isValid || !dirty}
-                className="!ml-0"
-              >
-                Save settings
-              </LoadingButton>
-            </div>
-          </div>
-        </Form>
-      )}
-    </Formik>
-  );
-}
diff --git a/app/react/portainer/settings/EdgeComputeView/AutomaticEdgeEnvCreation/AutomaticEdgeEnvCreation.tsx b/app/react/portainer/settings/EdgeComputeView/AutomaticEdgeEnvCreation/AutomaticEdgeEnvCreation.tsx
deleted file mode 100644
index 813ac5ff0..000000000
--- a/app/react/portainer/settings/EdgeComputeView/AutomaticEdgeEnvCreation/AutomaticEdgeEnvCreation.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Laptop } from 'lucide-react';
-
-import { Widget, WidgetBody, WidgetTitle } from '@@/Widget';
-
-import { useSettings } from '../../queries';
-
-import { AutoEnvCreationSettingsForm } from './AutoEnvCreationSettingsForm';
-
-export function AutomaticEdgeEnvCreation() {
-  const settingsQuery = useSettings();
-
-  if (!settingsQuery.data) {
-    return null;
-  }
-
-  const settings = settingsQuery.data;
-
-  return (
-    <Widget>
-      <WidgetTitle icon={Laptop} title="Automatic Edge Environment Creation" />
-      <WidgetBody>
-        <AutoEnvCreationSettingsForm settings={settings} />
-      </WidgetBody>
-    </Widget>
-  );
-}
diff --git a/app/react/portainer/settings/EdgeComputeView/AutomaticEdgeEnvCreation/EnableWaitingRoomSwitch.tsx b/app/react/portainer/settings/EdgeComputeView/AutomaticEdgeEnvCreation/EnableWaitingRoomSwitch.tsx
deleted file mode 100644
index 45b557991..000000000
--- a/app/react/portainer/settings/EdgeComputeView/AutomaticEdgeEnvCreation/EnableWaitingRoomSwitch.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import { useField } from 'formik';
-
-import { confirm } from '@@/modals/confirm';
-import { FormControl } from '@@/form-components/FormControl';
-import { Switch } from '@@/form-components/SwitchField/Switch';
-import { buildConfirmButton } from '@@/modals/utils';
-import { ModalType } from '@@/modals';
-
-export function EnabledWaitingRoomSwitch() {
-  const [inputProps, meta, helpers] = useField<boolean>('EnableWaitingRoom');
-
-  return (
-    <FormControl
-      inputId="edge_waiting_room"
-      label="Enable Edge Environment Waiting Room"
-      size="medium"
-      errors={meta.error}
-    >
-      <Switch
-        id="edge_waiting_room"
-        data-cy="edge-waiting-room-switch"
-        name="EnableWaitingRoom"
-        className="space-right"
-        checked={inputProps.value}
-        onChange={handleChange}
-      />
-    </FormControl>
-  );
-
-  async function handleChange(enable: boolean) {
-    if (enable) {
-      helpers.setValue(true);
-      return;
-    }
-
-    const confirmed = await confirm({
-      modalType: ModalType.Warn,
-      title: 'Disable Edge Environment Waiting Room',
-      message:
-        'By disabling the waiting room feature, all devices requesting association will be automatically associated and could pose a security risk. Are you sure?',
-      confirmButton: buildConfirmButton('Confirm', 'danger'),
-    });
-
-    if (!confirmed) {
-      return;
-    }
-
-    helpers.setValue(false);
-  }
-}
diff --git a/app/react/portainer/settings/EdgeComputeView/AutomaticEdgeEnvCreation/index.ts b/app/react/portainer/settings/EdgeComputeView/AutomaticEdgeEnvCreation/index.ts
deleted file mode 100644
index 1a10043f7..000000000
--- a/app/react/portainer/settings/EdgeComputeView/AutomaticEdgeEnvCreation/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { AutomaticEdgeEnvCreation } from './AutomaticEdgeEnvCreation';