diff --git a/backend/src/ee/services/license/license-dal.ts b/backend/src/ee/services/license/license-dal.ts
index 4f37a4f93..5cbfca1d6 100644
--- a/backend/src/ee/services/license/license-dal.ts
+++ b/backend/src/ee/services/license/license-dal.ts
@@ -54,7 +54,7 @@ export const licenseDALFactory = (db: TDbClient) => {
 
       return userCount + identityCount;
     } catch (error) {
-      throw new DatabaseError({ error, name: "Count of Org Identities" });
+      throw new DatabaseError({ error, name: "Count of Org Users + Identities" });
     }
   };
 
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 89e36e91a..422fe43f3 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -87,7 +87,7 @@ services:
       - 4000:4000
     environment:
       - NODE_ENV=development
-      # - DB_CONNECTION_URI=postgres://infisical:infisical@db/infisical?sslmode=disable
+      - DB_CONNECTION_URI=postgres://infisical:infisical@db/infisical?sslmode=disable
       - TELEMETRY_ENABLED=false
     volumes:
       - ./backend/src:/app/src
diff --git a/frontend/src/layouts/AppLayout/AppLayout.tsx b/frontend/src/layouts/AppLayout/AppLayout.tsx
index d4b1f17f4..72351df88 100644
--- a/frontend/src/layouts/AppLayout/AppLayout.tsx
+++ b/frontend/src/layouts/AppLayout/AppLayout.tsx
@@ -652,19 +652,19 @@ export const AppLayout = ({ children }: LayoutProps) => {
                           </MenuItem>
                         </a>
                       </Link>
-                      {/* {(window.location.origin.includes("https://app.infisical.com") ||
-                        window.location.origin.includes("https://gamma.infisical.com")) && ( */}
-                      <Link href={`/org/${currentOrg?.id}/billing`} passHref>
-                        <a>
-                          <MenuItem
-                            isSelected={router.asPath === `/org/${currentOrg?.id}/billing`}
-                            icon="system-outline-103-coin-cash-monetization"
-                          >
-                            Usage & Billing
-                          </MenuItem>
-                        </a>
-                      </Link>
-                      {/* )} */}
+                      {(window.location.origin.includes("https://app.infisical.com") ||
+                        window.location.origin.includes("https://gamma.infisical.com")) && (
+                        <Link href={`/org/${currentOrg?.id}/billing`} passHref>
+                          <a>
+                            <MenuItem
+                              isSelected={router.asPath === `/org/${currentOrg?.id}/billing`}
+                              icon="system-outline-103-coin-cash-monetization"
+                            >
+                              Usage & Billing
+                            </MenuItem>
+                          </a>
+                        </Link>
+                      )}
                       <Link href={`/org/${currentOrg?.id}/settings`} passHref>
                         <a>
                           <MenuItem