diff --git a/src/app/[orgId]/settings/(private)/remote-exit-nodes/[remoteExitNodeId]/credentials/page.tsx b/src/app/[orgId]/settings/(private)/remote-exit-nodes/[remoteExitNodeId]/credentials/page.tsx
index 00cf4e775..6280ebdd0 100644
--- a/src/app/[orgId]/settings/(private)/remote-exit-nodes/[remoteExitNodeId]/credentials/page.tsx
+++ b/src/app/[orgId]/settings/(private)/remote-exit-nodes/[remoteExitNodeId]/credentials/page.tsx
@@ -181,27 +181,25 @@ export default function CredentialsPage() {
                             </Alert>
                         )}
                     </SettingsSectionBody>
-                    {!env.flags.disableEnterpriseFeatures && (
-                        <SettingsSectionFooter>
-                            <Button
-                                variant="outline"
-                                onClick={() => {
-                                    setShouldDisconnect(false);
-                                    setModalOpen(true);
-                                }}
-                            >
-                                {t("regenerateCredentialsButton")}
-                            </Button>
-                            <Button
-                                onClick={() => {
-                                    setShouldDisconnect(true);
-                                    setModalOpen(true);
-                                }}
-                            >
-                                {t("remoteExitNodeRegenerateAndDisconnect")}
-                            </Button>
-                        </SettingsSectionFooter>
-                    )}
+                    <SettingsSectionFooter>
+                        <Button
+                            variant="outline"
+                            onClick={() => {
+                                setShouldDisconnect(false);
+                                setModalOpen(true);
+                            }}
+                        >
+                            {t("regenerateCredentialsButton")}
+                        </Button>
+                        <Button
+                            onClick={() => {
+                                setShouldDisconnect(true);
+                                setModalOpen(true);
+                            }}
+                        >
+                            {t("remoteExitNodeRegenerateAndDisconnect")}
+                        </Button>
+                    </SettingsSectionFooter>
                 </SettingsSection>
             </SettingsContainer>
 
diff --git a/src/app/[orgId]/settings/clients/machine/[niceId]/credentials/page.tsx b/src/app/[orgId]/settings/clients/machine/[niceId]/credentials/page.tsx
index c575a53b2..df8a03faf 100644
--- a/src/app/[orgId]/settings/clients/machine/[niceId]/credentials/page.tsx
+++ b/src/app/[orgId]/settings/clients/machine/[niceId]/credentials/page.tsx
@@ -165,27 +165,25 @@ export default function CredentialsPage() {
                             </Alert>
                         )}
                     </SettingsSectionBody>
-                    {!env.flags.disableEnterpriseFeatures && (
-                        <SettingsSectionFooter>
-                            <Button
-                                variant="outline"
-                                onClick={() => {
-                                    setShouldDisconnect(false);
-                                    setModalOpen(true);
-                                }}
-                            >
-                                {t("regenerateCredentialsButton")}
-                            </Button>
-                            <Button
-                                onClick={() => {
-                                    setShouldDisconnect(true);
-                                    setModalOpen(true);
-                                }}
-                            >
-                                {t("clientRegenerateAndDisconnect")}
-                            </Button>
-                        </SettingsSectionFooter>
-                    )}
+                    <SettingsSectionFooter>
+                        <Button
+                            variant="outline"
+                            onClick={() => {
+                                setShouldDisconnect(false);
+                                setModalOpen(true);
+                            }}
+                        >
+                            {t("regenerateCredentialsButton")}
+                        </Button>
+                        <Button
+                            onClick={() => {
+                                setShouldDisconnect(true);
+                                setModalOpen(true);
+                            }}
+                        >
+                            {t("clientRegenerateAndDisconnect")}
+                        </Button>
+                    </SettingsSectionFooter>
                 </SettingsSection>
 
                 <OlmInstallCommands
diff --git a/src/app/[orgId]/settings/sites/[niceId]/credentials/page.tsx b/src/app/[orgId]/settings/sites/[niceId]/credentials/page.tsx
index 72bea2ccf..434db23c7 100644
--- a/src/app/[orgId]/settings/sites/[niceId]/credentials/page.tsx
+++ b/src/app/[orgId]/settings/sites/[niceId]/credentials/page.tsx
@@ -263,27 +263,25 @@ export default function CredentialsPage() {
                                     </Alert>
                                 )}
                             </SettingsSectionBody>
-                            {!env.flags.disableEnterpriseFeatures && (
-                                <SettingsSectionFooter>
-                                    <Button
-                                        variant="outline"
-                                        onClick={() => {
-                                            setShouldDisconnect(false);
-                                            setModalOpen(true);
-                                        }}
-                                    >
-                                        {t("regenerateCredentialsButton")}
-                                    </Button>
-                                    <Button
-                                        onClick={() => {
-                                            setShouldDisconnect(true);
-                                            setModalOpen(true);
-                                        }}
-                                    >
-                                        {t("siteRegenerateAndDisconnect")}
-                                    </Button>
-                                </SettingsSectionFooter>
-                            )}
+                            <SettingsSectionFooter>
+                                <Button
+                                    variant="outline"
+                                    onClick={() => {
+                                        setShouldDisconnect(false);
+                                        setModalOpen(true);
+                                    }}
+                                >
+                                    {t("regenerateCredentialsButton")}
+                                </Button>
+                                <Button
+                                    onClick={() => {
+                                        setShouldDisconnect(true);
+                                        setModalOpen(true);
+                                    }}
+                                >
+                                    {t("siteRegenerateAndDisconnect")}
+                                </Button>
+                            </SettingsSectionFooter>
                         </SettingsSection>
 
                         <NewtSiteInstallCommands
@@ -368,13 +366,11 @@ export default function CredentialsPage() {
                                 </>
                             )}
                         </SettingsSectionBody>
-                        {!env.flags.disableEnterpriseFeatures && (
-                            <SettingsSectionFooter>
-                                <Button onClick={() => setModalOpen(true)}>
-                                    {t("siteRegenerateAndDisconnect")}
-                                </Button>
-                            </SettingsSectionFooter>
-                        )}
+                        <SettingsSectionFooter>
+                            <Button onClick={() => setModalOpen(true)}>
+                                {t("siteRegenerateAndDisconnect")}
+                            </Button>
+                        </SettingsSectionFooter>
                     </SettingsSection>
                 )}
             </SettingsContainer>