diff --git a/backend/danswer/configs/app_configs.py b/backend/danswer/configs/app_configs.py
index f53daf3a68e..d7733fdc0ab 100644
--- a/backend/danswer/configs/app_configs.py
+++ b/backend/danswer/configs/app_configs.py
@@ -134,7 +134,7 @@
     os.environ.get("POSTGRES_PASSWORD") or "password"
 )
 POSTGRES_HOST = os.environ.get("POSTGRES_HOST") or "localhost"
-POSTGRES_PORT = os.environ.get("POSTGRES_PORT") or "5433"
+POSTGRES_PORT = os.environ.get("POSTGRES_PORT") or "5432"
 POSTGRES_DB = os.environ.get("POSTGRES_DB") or "postgres"
 
 # defaults to False
diff --git a/deployment/docker_compose/docker-compose.dev.yml b/deployment/docker_compose/docker-compose.dev.yml
index deef76ada17..eb5ba5efc88 100644
--- a/deployment/docker_compose/docker-compose.dev.yml
+++ b/deployment/docker_compose/docker-compose.dev.yml
@@ -287,7 +287,7 @@ services:
       - POSTGRES_USER=${POSTGRES_USER:-postgres}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password}
     ports:
-      - "5433:5432"
+      - "5432:5432"
     volumes:
       - db_volume:/var/lib/postgresql/data
 
diff --git a/deployment/docker_compose/docker-compose.gpu-dev.yml b/deployment/docker_compose/docker-compose.gpu-dev.yml
index c2e2991e103..74da119737e 100644
--- a/deployment/docker_compose/docker-compose.gpu-dev.yml
+++ b/deployment/docker_compose/docker-compose.gpu-dev.yml
@@ -295,7 +295,7 @@ services:
       - POSTGRES_USER=${POSTGRES_USER:-postgres}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password}
     ports:
-      - "5433:5432"
+      - "5432:5432"
     volumes:
       - db_volume:/var/lib/postgresql/data
 
diff --git a/deployment/docker_compose/docker-compose.search-testing.yml b/deployment/docker_compose/docker-compose.search-testing.yml
index c477e85512d..ecd796f6716 100644
--- a/deployment/docker_compose/docker-compose.search-testing.yml
+++ b/deployment/docker_compose/docker-compose.search-testing.yml
@@ -153,7 +153,7 @@ services:
       - POSTGRES_USER=${POSTGRES_USER:-postgres}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password}
     ports:
-      - "5433"
+      - "5432"
     volumes:
       - db_volume:/var/lib/postgresql/data
 
diff --git a/web/src/app/admin/assistants/AssistantEditor.tsx b/web/src/app/admin/assistants/AssistantEditor.tsx
index f8bdf55f745..1c32beae14a 100644
--- a/web/src/app/admin/assistants/AssistantEditor.tsx
+++ b/web/src/app/admin/assistants/AssistantEditor.tsx
@@ -1184,20 +1184,16 @@ export function AssistantEditor({
                     />
                   </div>
 
-                  {isPaidEnterpriseFeaturesEnabled &&
-                    userGroups &&
-                    userGroups.length > 0 && (
-                      <IsPublicGroupSelector
-                        formikProps={{
-                          values,
-                          isSubmitting,
-                          setFieldValue,
-                          ...formikProps,
-                        }}
-                        objectName="assistant"
-                        enforceGroupSelection={false}
-                      />
-                    )}
+                  <IsPublicGroupSelector
+                    formikProps={{
+                      values,
+                      isSubmitting,
+                      setFieldValue,
+                      ...formikProps,
+                    }}
+                    objectName="assistant"
+                    enforceGroupSelection={false}
+                  />
                 </>
               )}
 
diff --git a/web/src/app/admin/configuration/llm/CustomLLMProviderUpdateForm.tsx b/web/src/app/admin/configuration/llm/CustomLLMProviderUpdateForm.tsx
index 6a9c0756cb9..5252e6aede5 100644
--- a/web/src/app/admin/configuration/llm/CustomLLMProviderUpdateForm.tsx
+++ b/web/src/app/admin/configuration/llm/CustomLLMProviderUpdateForm.tsx
@@ -420,27 +420,12 @@ export function CustomLLMProviderUpdateForm({
             />
 
             {showAdvancedOptions && (
-              <>
-                {isPaidEnterpriseFeaturesEnabled && userGroups && (
-                  <>
-                    <BooleanFormField
-                      small
-                      removeIndent
-                      alignTop
-                      name="is_public"
-                      label="Is Public?"
-                      subtext="If set, this LLM Provider will be available to all users. If not, only the specified User Groups will be able to use it."
-                    />
-
-                    <IsPublicGroupSelector
-                      formikProps={formikProps}
-                      objectName="LLM Provider"
-                      publicToWhom="all users"
-                      enforceGroupSelection={true}
-                    />
-                  </>
-                )}
-              </>
+              <IsPublicGroupSelector
+                formikProps={formikProps}
+                objectName="LLM Provider"
+                publicToWhom="all users"
+                enforceGroupSelection={true}
+              />
             )}
 
             <div>
diff --git a/web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx b/web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx
index b008a54aae8..af30479aaa0 100644
--- a/web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx
+++ b/web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx
@@ -379,15 +379,13 @@ export default function AddConnector({
               </Card>
             )}
 
-            {!(formStep == 0 && connector == "google_drive") && (
-              <NavigationRow
-                activatedCredential={credentialActivated != null}
-                isValid={formikProps.isValid}
-                onSubmit={formikProps.handleSubmit}
-                noCredentials={noCredentials}
-                noAdvanced={connector !== "file"}
-              />
-            )}
+            <NavigationRow
+              activatedCredential={credentialActivated != null}
+              isValid={formikProps.isValid}
+              onSubmit={formikProps.handleSubmit}
+              noCredentials={noCredentials}
+              noAdvanced={connector !== "file"}
+            />
           </div>
         );
       }}
diff --git a/web/src/components/IsPublicGroupSelector.tsx b/web/src/components/IsPublicGroupSelector.tsx
index f48c112b853..c5c73a82c2d 100644
--- a/web/src/components/IsPublicGroupSelector.tsx
+++ b/web/src/components/IsPublicGroupSelector.tsx
@@ -1,3 +1,4 @@
+import { usePaidEnterpriseFeaturesEnabled } from "@/components/settings/usePaidEnterpriseFeaturesEnabled";
 import React, { useState, useEffect } from "react";
 import { FormikProps, FieldArray, ArrayHelpers, ErrorMessage } from "formik";
 import { Text, Divider } from "@tremor/react";
@@ -27,10 +28,11 @@ export const IsPublicGroupSelector = <T extends IsPublicGroupSelectorFormType>({
 }) => {
   const { data: userGroups, isLoading: userGroupsIsLoading } = useUserGroups();
   const { isAdmin, user, isLoadingUser, isCurator } = useUser();
+  const isPaidEnterpriseFeaturesEnabled = usePaidEnterpriseFeaturesEnabled();
   const [shouldHideContent, setShouldHideContent] = useState(false);
 
   useEffect(() => {
-    if (user && userGroups) {
+    if (user && userGroups && isPaidEnterpriseFeaturesEnabled) {
       const isUserAdmin = user.role === UserRole.ADMIN;
       if (!isUserAdmin) {
         formikProps.setFieldValue("is_public", false);
@@ -55,6 +57,9 @@ export const IsPublicGroupSelector = <T extends IsPublicGroupSelectorFormType>({
   if (isLoadingUser || userGroupsIsLoading) {
     return <div>Loading...</div>;
   }
+  if (!isPaidEnterpriseFeaturesEnabled) {
+    return null;
+  }
 
   if (shouldHideContent && enforceGroupSelection) {
     return (
diff --git a/web/src/components/credentials/actions/CreateCredential.tsx b/web/src/components/credentials/actions/CreateCredential.tsx
index 7e19e274a88..5188f3d02a4 100644
--- a/web/src/components/credentials/actions/CreateCredential.tsx
+++ b/web/src/components/credentials/actions/CreateCredential.tsx
@@ -178,7 +178,7 @@ export default function CreateCredential({
       initialValues={
         {
           name: "",
-          is_public: isAdmin,
+          is_public: isAdmin || !isPaidEnterpriseFeaturesEnabled,
           groups: [],
         } as formType
       }