diff --git a/.changeset/stupid-pigs-share.md b/.changeset/stupid-pigs-share.md
new file mode 100644
index 000000000000..55d68c66d587
--- /dev/null
+++ b/.changeset/stupid-pigs-share.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+Wraps some room settings in an accordion advanced settings section in room edit contextual bar to improve organization
diff --git a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
index ce2a7862bb0b..b49ddb845cdd 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable complexity */
 import type { IRoomWithRetentionPolicy } from '@rocket.chat/core-typings';
 import { isRoomFederated } from '@rocket.chat/core-typings';
 import type { SelectOption } from '@rocket.chat/fuselage';
@@ -19,6 +20,7 @@ import {
 	ButtonGroup,
 	Box,
 	TextAreaInput,
+	AccordionItem,
 } from '@rocket.chat/fuselage';
 import { useEffectEvent, useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
@@ -223,6 +225,11 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 	const retentionFilesOnlyField = useUniqueId();
 	const retentionIgnoreThreads = useUniqueId();
 
+	const showAdvancedSettings = canViewEncrypted || canViewReadOnly || readOnly || canViewArchived || canViewJoinCode || canViewHideSysMes;
+	const showRetentionPolicy = canEditRoomRetentionPolicy && retentionPolicy?.enabled;
+
+	const showAccordion = showAdvancedSettings || showRetentionPolicy;
+
 	return (
 		<>
 			<ContextualbarHeader>
@@ -315,7 +322,6 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 								</FieldRow>
 							</Field>
 						)}
-
 						{canViewType && (
 							<Field>
 								<FieldRow>
@@ -344,243 +350,258 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 								</FieldRow>
 							</Field>
 						)}
-						{canViewEncrypted && (
-							<Field>
-								<FieldRow>
-									<FieldLabel htmlFor={encryptedField}>{t('Encrypted')}</FieldLabel>
-									<Controller
-										control={control}
-										name='encrypted'
-										render={({ field: { value, ...field } }) => (
-											<ToggleSwitch
-												id={encryptedField}
-												aria-describedby={`${encryptedField}-hint`}
-												{...field}
-												disabled={!canToggleEncryption || isFederated}
-												checked={value}
-											/>
-										)}
-									/>
-								</FieldRow>
-								<FieldRow>
-									<FieldHint id={`${encryptedField}-hint`}>{t('Encrypted_field_hint')}</FieldHint>
-								</FieldRow>
-							</Field>
-						)}
-						{canViewReadOnly && (
-							<Field>
-								<FieldRow>
-									<FieldLabel htmlFor={readOnlyField}>{t('Read_only')}</FieldLabel>
-									<Controller
-										control={control}
-										name='readOnly'
-										render={({ field: { value, ...field } }) => (
-											<ToggleSwitch
-												id={readOnlyField}
-												{...field}
-												checked={value}
-												disabled={!canSetReadOnly || isFederated}
-												aria-describedby={`${readOnlyField}-hint`}
-											/>
-										)}
-									/>
-								</FieldRow>
-								<FieldHint id={`${readOnlyField}-hint`}>
-									{readOnly ? t('Read_only_field_hint_enabled', { roomType }) : t('Read_only_field_hint_disabled')}
-								</FieldHint>
-							</Field>
-						)}
-						{readOnly && (
-							<Field>
-								<FieldRow>
-									<FieldLabel htmlFor={reactWhenReadOnlyField}>{t('React_when_read_only')}</FieldLabel>
-									<Controller
-										control={control}
-										name='reactWhenReadOnly'
-										render={({ field: { value, ...field } }) => (
-											<ToggleSwitch
-												id={reactWhenReadOnlyField}
-												{...field}
-												disabled={!canSetReactWhenReadOnly}
-												checked={value}
-												aria-describedby={`${reactWhenReadOnlyField}-hint`}
-											/>
-										)}
-									/>
-								</FieldRow>
-								<FieldRow>
-									<FieldHint id={`${reactWhenReadOnlyField}-hint`}>
-										{reactWhenReadOnly ? t('Anyone_can_react_to_messages') : t('Only_authorized_users_can_react_to_messages')}
-									</FieldHint>
-								</FieldRow>
-							</Field>
-						)}
-						{canViewArchived && (
-							<Field>
-								<FieldRow>
-									<FieldLabel htmlFor={archivedField}>{t('Room_archivation_state_true')}</FieldLabel>
-									<Controller
-										control={control}
-										name='archived'
-										render={({ field: { value, ...field } }) => (
-											<ToggleSwitch
-												id={archivedField}
-												aria-describedby={`${archivedField}-hint`}
-												{...field}
-												disabled={!canArchiveOrUnarchive}
-												checked={value}
-											/>
-										)}
-									/>
-								</FieldRow>
-								{archived && (
-									<FieldRow>
-										<FieldHint id={`${archivedField}-hint`}>{t('New_messages_cannot_be_sent')}</FieldHint>
-									</FieldRow>
-								)}
-							</Field>
-						)}
-						{canViewJoinCode && (
-							<Field>
-								<FieldRow>
-									<FieldLabel htmlFor={joinCodeRequiredField}>{t('Password_to_access')}</FieldLabel>
-									<Controller
-										control={control}
-										name='joinCodeRequired'
-										render={({ field: { value, ...field } }) => (
-											<ToggleSwitch id={joinCodeRequiredField} {...field} disabled={isFederated} checked={value} />
-										)}
-									/>
-								</FieldRow>
-								{joinCodeRequired && (
-									<FieldRow>
-										<Controller
-											name='joinCode'
-											control={control}
-											render={({ field }) => <PasswordInput {...field} placeholder={t('Reset_password')} disabled={!joinCodeRequired} />}
-										/>
-									</FieldRow>
-								)}
-							</Field>
-						)}
-						{canViewHideSysMes && (
-							<Field>
-								<FieldRow>
-									<FieldLabel htmlFor={hideSysMesField}>{t('Hide_System_Messages')}</FieldLabel>
-									<Controller
-										control={control}
-										name='hideSysMes'
-										render={({ field: { value, ...field } }) => (
-											<ToggleSwitch id={hideSysMesField} {...field} checked={value} disabled={isFederated} />
-										)}
-									/>
-								</FieldRow>
-								<FieldRow>
-									<Controller
-										control={control}
-										name='systemMessages'
-										render={({ field }) => (
-											<MultiSelect
-												{...field}
-												options={sysMesOptions}
-												disabled={!hideSysMes || isFederated}
-												placeholder={t('Select_messages_to_hide')}
-											/>
-										)}
-									/>
-								</FieldRow>
-							</Field>
-						)}
 					</FieldGroup>
-					{canEditRoomRetentionPolicy && retentionPolicy?.enabled && (
+					{showAccordion && (
 						<Accordion>
-							<Accordion.Item title={t('Prune')}>
-								<FieldGroup>
-									<Field>
-										<FieldRow>
-											<FieldLabel htmlFor={retentionEnabledField}>{t('RetentionPolicyRoom_Enabled')}</FieldLabel>
-											<Controller
-												control={control}
-												name='retentionEnabled'
-												render={({ field: { value, ...field } }) => <ToggleSwitch id={retentionEnabledField} {...field} checked={value} />}
-											/>
-										</FieldRow>
-									</Field>
-									<Field>
-										<FieldRow>
-											<FieldLabel htmlFor={retentionOverrideGlobalField}>{t('RetentionPolicyRoom_OverrideGlobal')}</FieldLabel>
-											<Controller
-												control={control}
-												name='retentionOverrideGlobal'
-												render={({ field: { value, ...field } }) => (
-													<ToggleSwitch id={retentionOverrideGlobalField} {...field} disabled={!retentionEnabled} checked={value} />
-												)}
-											/>
-										</FieldRow>
-									</Field>
-									{retentionOverrideGlobal && (
-										<>
-											<Callout type='danger'>
-												<RawText>{t('RetentionPolicyRoom_ReadTheDocs')}</RawText>
-											</Callout>
+							{showAdvancedSettings && (
+								<AccordionItem title={t('Advanced_settings')}>
+									<FieldGroup>
+										<Box is='h5' fontScale='h5' color='titles-labels'>
+											{t('Security_and_permissions')}
+										</Box>
+										{canViewEncrypted && (
 											<Field>
-												<FieldLabel htmlFor={retentionMaxAgeField}>
-													{t('RetentionPolicyRoom_MaxAge', { max: retentionMaxAgeDefault })}
-												</FieldLabel>
 												<FieldRow>
+													<FieldLabel htmlFor={encryptedField}>{t('Encrypted')}</FieldLabel>
 													<Controller
 														control={control}
-														name='retentionMaxAge'
-														render={({ field: { onChange, ...field } }) => (
-															<NumberInput
-																id={retentionMaxAgeField}
+														name='encrypted'
+														render={({ field: { value, ...field } }) => (
+															<ToggleSwitch
+																id={encryptedField}
+																aria-describedby={`${encryptedField}-hint`}
 																{...field}
-																onChange={(e: ChangeEvent<HTMLInputElement>) => onChange(Number(e.currentTarget.value))}
+																disabled={!canToggleEncryption || isFederated}
+																checked={value}
 															/>
 														)}
 													/>
 												</FieldRow>
+												<FieldRow>
+													<FieldHint id={`${encryptedField}-hint`}>{t('Encrypted_field_hint')}</FieldHint>
+												</FieldRow>
 											</Field>
+										)}
+										{canViewReadOnly && (
 											<Field>
 												<FieldRow>
-													<FieldLabel htmlFor={retentionExcludePinnedField}>{t('RetentionPolicyRoom_ExcludePinned')}</FieldLabel>
+													<FieldLabel htmlFor={readOnlyField}>{t('Read_only')}</FieldLabel>
 													<Controller
 														control={control}
-														name='retentionExcludePinned'
+														name='readOnly'
 														render={({ field: { value, ...field } }) => (
-															<ToggleSwitch id={retentionExcludePinnedField} {...field} checked={value} />
+															<ToggleSwitch
+																id={readOnlyField}
+																{...field}
+																checked={value}
+																disabled={!canSetReadOnly || isFederated}
+																aria-describedby={`${readOnlyField}-hint`}
+															/>
 														)}
 													/>
 												</FieldRow>
+												<FieldHint id={`${readOnlyField}-hint`}>
+													{readOnly ? t('Read_only_field_hint_enabled', { roomType }) : t('Read_only_field_hint_disabled')}
+												</FieldHint>
 											</Field>
+										)}
+										{readOnly && (
 											<Field>
 												<FieldRow>
-													<FieldLabel htmlFor={retentionFilesOnlyField}>{t('RetentionPolicyRoom_FilesOnly')}</FieldLabel>
+													<FieldLabel htmlFor={reactWhenReadOnlyField}>{t('React_when_read_only')}</FieldLabel>
 													<Controller
 														control={control}
-														name='retentionFilesOnly'
+														name='reactWhenReadOnly'
 														render={({ field: { value, ...field } }) => (
-															<ToggleSwitch id={retentionFilesOnlyField} {...field} checked={value} />
+															<ToggleSwitch
+																id={reactWhenReadOnlyField}
+																{...field}
+																disabled={!canSetReactWhenReadOnly}
+																checked={value}
+																aria-describedby={`${reactWhenReadOnlyField}-hint`}
+															/>
 														)}
 													/>
 												</FieldRow>
+												<FieldRow>
+													<FieldHint id={`${reactWhenReadOnlyField}-hint`}>
+														{reactWhenReadOnly ? t('Anyone_can_react_to_messages') : t('Only_authorized_users_can_react_to_messages')}
+													</FieldHint>
+												</FieldRow>
 											</Field>
+										)}
+										{canViewArchived && (
 											<Field>
 												<FieldRow>
-													<FieldLabel htmlFor={retentionIgnoreThreads}>{t('RetentionPolicy_DoNotPruneThreads')}</FieldLabel>
+													<FieldLabel htmlFor={archivedField}>{t('Room_archivation_state_true')}</FieldLabel>
 													<Controller
 														control={control}
-														name='retentionIgnoreThreads'
+														name='archived'
 														render={({ field: { value, ...field } }) => (
-															<ToggleSwitch id={retentionIgnoreThreads} {...field} checked={value} />
+															<ToggleSwitch
+																id={archivedField}
+																aria-describedby={`${archivedField}-hint`}
+																{...field}
+																disabled={!canArchiveOrUnarchive}
+																checked={value}
+															/>
 														)}
 													/>
 												</FieldRow>
+												{archived && (
+													<FieldRow>
+														<FieldHint id={`${archivedField}-hint`}>{t('New_messages_cannot_be_sent')}</FieldHint>
+													</FieldRow>
+												)}
 											</Field>
-										</>
-									)}
-								</FieldGroup>
-							</Accordion.Item>
+										)}
+										{canViewJoinCode && (
+											<Field>
+												<FieldRow>
+													<FieldLabel htmlFor={joinCodeRequiredField}>{t('Password_to_access')}</FieldLabel>
+													<Controller
+														control={control}
+														name='joinCodeRequired'
+														render={({ field: { value, ...field } }) => (
+															<ToggleSwitch id={joinCodeRequiredField} {...field} disabled={isFederated} checked={value} />
+														)}
+													/>
+												</FieldRow>
+												{joinCodeRequired && (
+													<FieldRow>
+														<Controller
+															name='joinCode'
+															control={control}
+															render={({ field }) => (
+																<PasswordInput {...field} placeholder={t('Reset_password')} disabled={!joinCodeRequired} />
+															)}
+														/>
+													</FieldRow>
+												)}
+											</Field>
+										)}
+										{canViewHideSysMes && (
+											<Field>
+												<FieldRow>
+													<FieldLabel htmlFor={hideSysMesField}>{t('Hide_System_Messages')}</FieldLabel>
+													<Controller
+														control={control}
+														name='hideSysMes'
+														render={({ field: { value, ...field } }) => (
+															<ToggleSwitch id={hideSysMesField} {...field} checked={value} disabled={isFederated} />
+														)}
+													/>
+												</FieldRow>
+												<FieldRow>
+													<Controller
+														control={control}
+														name='systemMessages'
+														render={({ field }) => (
+															<MultiSelect
+																{...field}
+																options={sysMesOptions}
+																disabled={!hideSysMes || isFederated}
+																placeholder={t('Select_messages_to_hide')}
+															/>
+														)}
+													/>
+												</FieldRow>
+											</Field>
+										)}
+									</FieldGroup>
+								</AccordionItem>
+							)}
+							{showRetentionPolicy && (
+								<AccordionItem title={t('Prune')}>
+									<FieldGroup>
+										<Field>
+											<FieldRow>
+												<FieldLabel htmlFor={retentionEnabledField}>{t('RetentionPolicyRoom_Enabled')}</FieldLabel>
+												<Controller
+													control={control}
+													name='retentionEnabled'
+													render={({ field: { value, ...field } }) => (
+														<ToggleSwitch id={retentionEnabledField} {...field} checked={value} />
+													)}
+												/>
+											</FieldRow>
+										</Field>
+										<Field>
+											<FieldRow>
+												<FieldLabel htmlFor={retentionOverrideGlobalField}>{t('RetentionPolicyRoom_OverrideGlobal')}</FieldLabel>
+												<Controller
+													control={control}
+													name='retentionOverrideGlobal'
+													render={({ field: { value, ...field } }) => (
+														<ToggleSwitch id={retentionOverrideGlobalField} {...field} disabled={!retentionEnabled} checked={value} />
+													)}
+												/>
+											</FieldRow>
+										</Field>
+										{retentionOverrideGlobal && (
+											<>
+												<Callout type='danger'>
+													<RawText>{t('RetentionPolicyRoom_ReadTheDocs')}</RawText>
+												</Callout>
+												<Field>
+													<FieldLabel htmlFor={retentionMaxAgeField}>
+														{t('RetentionPolicyRoom_MaxAge', { max: retentionMaxAgeDefault })}
+													</FieldLabel>
+													<FieldRow>
+														<Controller
+															control={control}
+															name='retentionMaxAge'
+															render={({ field: { onChange, ...field } }) => (
+																<NumberInput
+																	id={retentionMaxAgeField}
+																	{...field}
+																	onChange={(e: ChangeEvent<HTMLInputElement>) => onChange(Number(e.currentTarget.value))}
+																/>
+															)}
+														/>
+													</FieldRow>
+												</Field>
+												<Field>
+													<FieldRow>
+														<FieldLabel htmlFor={retentionExcludePinnedField}>{t('RetentionPolicyRoom_ExcludePinned')}</FieldLabel>
+														<Controller
+															control={control}
+															name='retentionExcludePinned'
+															render={({ field: { value, ...field } }) => (
+																<ToggleSwitch id={retentionExcludePinnedField} {...field} checked={value} />
+															)}
+														/>
+													</FieldRow>
+												</Field>
+												<Field>
+													<FieldRow>
+														<FieldLabel htmlFor={retentionFilesOnlyField}>{t('RetentionPolicyRoom_FilesOnly')}</FieldLabel>
+														<Controller
+															control={control}
+															name='retentionFilesOnly'
+															render={({ field: { value, ...field } }) => (
+																<ToggleSwitch id={retentionFilesOnlyField} {...field} checked={value} />
+															)}
+														/>
+													</FieldRow>
+												</Field>
+												<Field>
+													<FieldRow>
+														<FieldLabel htmlFor={retentionIgnoreThreads}>{t('RetentionPolicy_DoNotPruneThreads')}</FieldLabel>
+														<Controller
+															control={control}
+															name='retentionIgnoreThreads'
+															render={({ field: { value, ...field } }) => (
+																<ToggleSwitch id={retentionIgnoreThreads} {...field} checked={value} />
+															)}
+														/>
+													</FieldRow>
+												</Field>
+											</>
+										)}
+									</FieldGroup>
+								</AccordionItem>
+							)}
 						</Accordion>
 					)}
 				</form>
diff --git a/apps/meteor/tests/e2e/e2e-encryption.spec.ts b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
index d98acaf847c4..8c6297e9975d 100644
--- a/apps/meteor/tests/e2e/e2e-encryption.spec.ts
+++ b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
@@ -280,6 +280,7 @@ test.describe.serial('e2e-encryption', () => {
 
 		await poHomeChannel.tabs.btnRoomInfo.click();
 		await poHomeChannel.tabs.room.btnEdit.click();
+		await poHomeChannel.tabs.room.advancedSettingsAccordion.click();
 
 		await expect(poHomeChannel.tabs.room.checkboxEncrypted).toBeVisible();
 	});
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts
index a76d89a9d962..78d536448a75 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts
@@ -51,6 +51,10 @@ export class HomeFlextabRoom {
 		return this.page.getByRole('dialog').getByRole('alert', { name: 'Retention policy warning callout' });
 	}
 
+	get advancedSettingsAccordion(): Locator {
+		return this.page.getByRole('dialog').getByRole('button', { name: 'Advanced settings' });
+	}
+
 	get pruneAccordion(): Locator {
 		return this.page.getByRole('dialog').getByRole('button', { name: 'Prune', exact: true });
 	}
diff --git a/apps/meteor/tests/e2e/retention-policy.spec.ts b/apps/meteor/tests/e2e/retention-policy.spec.ts
index 708e5f19b520..4f6b9ce3ff23 100644
--- a/apps/meteor/tests/e2e/retention-policy.spec.ts
+++ b/apps/meteor/tests/e2e/retention-policy.spec.ts
@@ -115,6 +115,7 @@ test.describe.serial('retention-policy', () => {
 				await auxContext.poHomeChannel.sidenav.openChat(targetChannel);
 				await auxContext.poHomeChannel.tabs.btnRoomInfo.click();
 				await auxContext.poHomeChannel.tabs.room.btnEdit.click();
+				await auxContext.poHomeChannel.tabs.room.advancedSettingsAccordion.click();
 				await auxContext.poHomeChannel.tabs.room.checkboxReadOnly.check();
 				await auxContext.poHomeChannel.tabs.room.btnSave.click();
 
diff --git a/apps/meteor/tests/e2e/team-management.spec.ts b/apps/meteor/tests/e2e/team-management.spec.ts
index 55530302ca96..350d55dfaab6 100644
--- a/apps/meteor/tests/e2e/team-management.spec.ts
+++ b/apps/meteor/tests/e2e/team-management.spec.ts
@@ -77,6 +77,7 @@ test.describe.serial('teams-management', () => {
 		await poHomeTeam.sidenav.openChat(targetTeam);
 		await poHomeTeam.tabs.btnRoomInfo.click();
 		await poHomeTeam.tabs.room.btnEdit.click();
+		await poHomeTeam.tabs.room.advancedSettingsAccordion.click();
 		await poHomeTeam.tabs.room.checkboxReadOnly.click();
 		await poHomeTeam.tabs.room.btnSave.click();
 	});