diff --git a/src/components/ResourceInfoBox.tsx b/src/components/ResourceInfoBox.tsx
index ebb5fac7..e04e3101 100644
--- a/src/components/ResourceInfoBox.tsx
+++ b/src/components/ResourceInfoBox.tsx
@@ -32,7 +32,7 @@ export default function ResourceInfoBox({}: ResourceInfoBoxType) {
                 {/* 4 cols because of the certs */}
                 <InfoSections
                     cols={
-                        resource.http && env.flags.generateOwnCertificates
+                        resource.http && env.flags.usePangolinDns
                             ? 4
                             : 3
                     }
@@ -137,6 +137,7 @@ export default function ResourceInfoBox({}: ResourceInfoBoxType) {
                     {resource.http &&
                         resource.domainId &&
                         resource.fullDomain &&
+                        env.flags.usePangolinDns &&
                         build != "oss" && (
                             <InfoSection>
                                 <InfoSectionTitle>
diff --git a/src/components/private/AuthPageSettings.tsx b/src/components/private/AuthPageSettings.tsx
index eda7e8a7..95097a33 100644
--- a/src/components/private/AuthPageSettings.tsx
+++ b/src/components/private/AuthPageSettings.tsx
@@ -460,7 +460,7 @@ const AuthPageSettings = forwardRef<AuthPageSettingsRef, AuthPageSettingsProps>(
                                             )}
 
                                             {env.flags
-                                                .generateOwnCertificates &&
+                                                .usePangolinDns &&
                                                 (build === "enterprise" ||
                                                     (build === "saas" &&
                                                         subscription?.subscribed)) &&