diff --git a/database/migrations/functions/packages/get_package.sql b/database/migrations/functions/packages/get_package.sql
index 8737f9170..e47e9bb86 100644
--- a/database/migrations/functions/packages/get_package.sql
+++ b/database/migrations/functions/packages/get_package.sql
@@ -97,20 +97,9 @@ begin
             'subscriptions', (select count(*) from subscription where package_id = v_package_id),
             'webhooks', (select count(*) from webhook__package where package_id = v_package_id)
         ),
-        'production_organizations', (
-            select json_agg(json_build_object(
-                'name', o.name,
-                'display_name', o.display_name,
-                'home_url', o.home_url,
-                'logo_image_id', o.logo_image_id
-            ))
-            from (
-                select o.name, o.display_name, o.home_url, o.logo_image_id
-                from production_usage pu
-                join organization o using (organization_id)
-                where pu.package_id = v_package_id
-                order by o.name asc
-            ) o
+        'production_organizations_count', (
+            select count(*) from production_usage
+            where package_id = v_package_id
         )
     ))
     from package p
diff --git a/database/tests/functions/packages/get_package.sql b/database/tests/functions/packages/get_package.sql
index d8796d320..975aec4d0 100644
--- a/database/tests/functions/packages/get_package.sql
+++ b/database/tests/functions/packages/get_package.sql
@@ -377,14 +377,7 @@ select is(
             "subscriptions": 1,
             "webhooks": 0
         },
-        "production_organizations": [
-            {
-                "name": "org2",
-                "display_name": "Organization 2",
-                "home_url": "https://org2.com",
-                "logo_image_id": "00000000-0000-0000-0000-000000000003"
-            }
-        ]
+        "production_organizations_count": 1
     }'::jsonb,
     'Last package1 version is returned as a json object'
 );
@@ -530,14 +523,7 @@ select is(
             "subscriptions": 1,
             "webhooks": 0
         },
-        "production_organizations": [
-            {
-                "name": "org2",
-                "display_name": "Organization 2",
-                "home_url": "https://org2.com",
-                "logo_image_id": "00000000-0000-0000-0000-000000000003"
-            }
-        ]
+        "production_organizations_count": 1
     }'::jsonb,
     'Last package1 version is returned as a json object'
 );
@@ -633,14 +619,7 @@ select is(
             "subscriptions": 1,
             "webhooks": 0
         },
-        "production_organizations": [
-            {
-                "name": "org2",
-                "display_name": "Organization 2",
-                "home_url": "https://org2.com",
-                "logo_image_id": "00000000-0000-0000-0000-000000000003"
-            }
-        ]
+        "production_organizations_count": 1
     }'::jsonb,
     'Requested package version is returned as a json object'
 );
@@ -688,7 +667,8 @@ select is(
         "stats": {
             "subscriptions": 0,
             "webhooks": 1
-        }
+        },
+        "production_organizations_count": 0
     }'::jsonb,
     'Last package2 version is returned as a json object'
 );
diff --git a/web/src/layout/common/ProductionBadge.test.tsx b/web/src/layout/common/ProductionBadge.test.tsx
index 17c48ab84..31b6a7757 100644
--- a/web/src/layout/common/ProductionBadge.test.tsx
+++ b/web/src/layout/common/ProductionBadge.test.tsx
@@ -15,7 +15,7 @@ describe('VerifiedPublisherBadge', () => {
 
   it('renders label', async () => {
     render(<ProductionBadge productionOrganizationsCount={7} />);
-    expect(screen.getByText('In Production')).toBeInTheDocument();
+    expect(screen.getByText('Production users')).toBeInTheDocument();
 
     const badge = screen.getByTestId('elementWithTooltip');
     expect(badge).toBeInTheDocument();
@@ -28,7 +28,7 @@ describe('VerifiedPublisherBadge', () => {
 
   it('renders label with tooltip msg in singular', async () => {
     render(<ProductionBadge productionOrganizationsCount={1} />);
-    expect(screen.getByText('In Production')).toBeInTheDocument();
+    expect(screen.getByText('Production users')).toBeInTheDocument();
 
     const badge = screen.getByTestId('elementWithTooltip');
     expect(badge).toBeInTheDocument();
diff --git a/web/src/layout/common/ProductionBadge.tsx b/web/src/layout/common/ProductionBadge.tsx
index c38554d98..ff9dd221d 100644
--- a/web/src/layout/common/ProductionBadge.tsx
+++ b/web/src/layout/common/ProductionBadge.tsx
@@ -14,7 +14,7 @@ const ProductionBadge = (props: Props) => {
   return (
     <ElementWithTooltip
       className={props.className}
-      element={<Label text="In Production" icon={<MdBusiness />} iconLegend={props.productionOrganizationsCount} />}
+      element={<Label text="Production users" icon={<MdBusiness />} iconLegend={props.productionOrganizationsCount} />}
       tooltipMessage={`${props.productionOrganizationsCount} ${
         props.productionOrganizationsCount === 1 ? 'organization is' : 'organizations are'
       } using this package in production`}
diff --git a/web/src/layout/common/__snapshots__/ProductionBadge.test.tsx.snap b/web/src/layout/common/__snapshots__/ProductionBadge.test.tsx.snap
index a1f76d740..60b2eec5a 100644
--- a/web/src/layout/common/__snapshots__/ProductionBadge.test.tsx.snap
+++ b/web/src/layout/common/__snapshots__/ProductionBadge.test.tsx.snap
@@ -48,7 +48,7 @@ exports[`VerifiedPublisherBadge creates snapshot 1`] = `
           <div
             class="text-nowrap border fw-bold labelText"
           >
-            In Production
+            Production users
           </div>
         </div>
       </div>
diff --git a/web/src/layout/package/OrgsUsingPackage/Card.module.css b/web/src/layout/package/OrgsUsingPackage/Card.module.css
deleted file mode 100644
index c1e8aff28..000000000
--- a/web/src/layout/package/OrgsUsingPackage/Card.module.css
+++ /dev/null
@@ -1,22 +0,0 @@
-.badge {
-  height: 25px;
-  max-width: 300px;
-  border-color: var(--border-md) !important;
-}
-
-.badgeContent {
-  font-size: 0.8rem;
-}
-
-.imageWrapper {
-  min-width: 23px;
-  width: 23px;
-  height: 23px;
-  border-color: var(--color-1-20) !important;
-  font-size: 0.8rem;
-}
-
-.image {
-  max-width: calc(100% - 4px);
-  max-height: calc(100% - 4px);
-}
diff --git a/web/src/layout/package/OrgsUsingPackage/Card.test.tsx b/web/src/layout/package/OrgsUsingPackage/Card.test.tsx
deleted file mode 100644
index a28ff51be..000000000
--- a/web/src/layout/package/OrgsUsingPackage/Card.test.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { BrowserRouter as Router } from 'react-router-dom';
-
-import OrgCard from './Card';
-
-const defaultProps = {
-  organization: {
-    name: 'artifacthub',
-    displayName: 'Artifact Hub',
-    homeUrl: 'https://artifacthub.io',
-    logoImageId: '35c5d3c7-421e-4b4a-97b0-86f4602a2f59',
-  },
-};
-
-describe('OrgCard', () => {
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-  it('creates snapshot', () => {
-    const { asFragment } = render(
-      <Router>
-        <OrgCard {...defaultProps} />
-      </Router>
-    );
-    expect(asFragment()).toMatchSnapshot();
-  });
-
-  describe('Render', () => {
-    it('renders component', () => {
-      render(
-        <Router>
-          <OrgCard {...defaultProps} />
-        </Router>
-      );
-
-      const org = screen.getByTestId('org-using-pkg');
-      expect(org).toBeInTheDocument();
-      expect(org).toHaveTextContent('Artifact Hub');
-
-      const link = screen.getByRole('button', { name: 'Open organization url' });
-      expect(link).toBeInTheDocument();
-      expect(link).toHaveAttribute('href', 'https://artifacthub.io');
-    });
-
-    it('renders component without url', () => {
-      render(
-        <Router>
-          <OrgCard organization={{ ...defaultProps.organization, homeUrl: undefined }} />
-        </Router>
-      );
-
-      expect(screen.queryByRole('button', { name: 'Open organization url' })).toBeNull();
-    });
-  });
-});
diff --git a/web/src/layout/package/OrgsUsingPackage/Card.tsx b/web/src/layout/package/OrgsUsingPackage/Card.tsx
deleted file mode 100644
index 0d52367ad..000000000
--- a/web/src/layout/package/OrgsUsingPackage/Card.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { MdBusiness } from 'react-icons/md';
-
-import { Organization } from '../../../types';
-import ExternalLink from '../../common/ExternalLink';
-import Image from '../../common/Image';
-import styles from './Card.module.css';
-
-interface Props {
-  organization: Organization;
-}
-
-const OrgCard = (props: Props) => {
-  const renderLabel = (): JSX.Element => {
-    return (
-      <div
-        data-testid="org-using-pkg"
-        className={`badge badge-rounded bg-light text-dark rounded-pill d-flex flex-row align-items-center ps-0 pe-3 border ${styles.badge}`}
-      >
-        <div className="me-2">
-          <div className={`rounded-circle border bg-white ${styles.imageWrapper} imageWrapper overflow-hidden`}>
-            <div className="d-flex align-items-center justify-content-center w-100 h-100">
-              <Image
-                alt={props.organization.displayName || props.organization.name}
-                imageId={props.organization.logoImageId}
-                className={`m-auto rounded-circle ${styles.image}`}
-                placeholderIcon={<MdBusiness />}
-              />
-            </div>
-          </div>
-        </div>
-
-        <div className={`text-truncate text-dark fw-bold ${styles.badgeContent}`}>
-          <span>{props.organization.displayName || props.organization.name}</span>
-        </div>
-      </div>
-    );
-  };
-
-  return (
-    <>
-      {props.organization.homeUrl ? (
-        <ExternalLink
-          href={props.organization.homeUrl}
-          className="d-inline-block text-dark h5 mb-2 me-3"
-          label="Open organization url"
-        >
-          {renderLabel()}
-        </ExternalLink>
-      ) : (
-        <div className="d-inline-block text-dark h5 mb-2 me-3">{renderLabel()}</div>
-      )}
-    </>
-  );
-};
-
-export default OrgCard;
diff --git a/web/src/layout/package/OrgsUsingPackage/OrgsUsingPackage.module.css b/web/src/layout/package/OrgsUsingPackage/OrgsUsingPackage.module.css
deleted file mode 100644
index bd8f747a3..000000000
--- a/web/src/layout/package/OrgsUsingPackage/OrgsUsingPackage.module.css
+++ /dev/null
@@ -1,52 +0,0 @@
-.content {
-  max-height: 28px;
-}
-
-.seeAllbtn {
-  font-size: 80%;
-}
-
-.modal {
-  max-width: 80%;
-  width: 620px !important;
-}
-
-.table {
-  table-layout: fixed;
-}
-
-.body {
-  background-color: var(--bs-white);
-}
-
-.imageWrapper {
-  min-width: 30px;
-  width: 30px;
-  height: 30px;
-  border-color: var(--color-1-10) !important;
-  padding: 0.2rem;
-}
-
-.image {
-  max-width: calc(100% - 4px);
-  max-height: calc(100% - 4px);
-}
-
-.orgIcon {
-  font-size: 80%;
-  top: -1px;
-}
-
-@media only screen and (min-width: 576px) {
-  .modalDialog {
-    max-width: 80% !important;
-    min-height: calc(100% - 10rem) !important;
-    max-height: calc(100% - 10rem) !important;
-    margin: 5rem auto !important;
-  }
-}
-@media only screen and (max-width: 767.98px) {
-  .title {
-    font-size: 1.25rem;
-  }
-}
diff --git a/web/src/layout/package/OrgsUsingPackage/__snapshots__/Card.test.tsx.snap b/web/src/layout/package/OrgsUsingPackage/__snapshots__/Card.test.tsx.snap
deleted file mode 100644
index db2be7dfe..000000000
--- a/web/src/layout/package/OrgsUsingPackage/__snapshots__/Card.test.tsx.snap
+++ /dev/null
@@ -1,47 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`OrgCard creates snapshot 1`] = `
-<DocumentFragment>
-  <a
-    aria-label="Open organization url"
-    class="link d-inline-block text-dark h5 mb-2 me-3"
-    href="https://artifacthub.io"
-    rel="noopener noreferrer"
-    role="button"
-    tabindex="-1"
-    target="_blank"
-  >
-    <div
-      class="badge badge-rounded bg-light text-dark rounded-pill d-flex flex-row align-items-center ps-0 pe-3 border badge"
-      data-testid="org-using-pkg"
-    >
-      <div
-        class="me-2"
-      >
-        <div
-          class="rounded-circle border bg-white imageWrapper imageWrapper overflow-hidden"
-        >
-          <div
-            class="d-flex align-items-center justify-content-center w-100 h-100"
-          >
-            <img
-              alt="Artifact Hub"
-              aria-hidden="true"
-              class="m-auto rounded-circle image"
-              src="/image/35c5d3c7-421e-4b4a-97b0-86f4602a2f59"
-              srcset="/image/35c5d3c7-421e-4b4a-97b0-86f4602a2f59@1x 1x, /image/35c5d3c7-421e-4b4a-97b0-86f4602a2f59@2x 2x, /image/35c5d3c7-421e-4b4a-97b0-86f4602a2f59@3x 3x, /image/35c5d3c7-421e-4b4a-97b0-86f4602a2f59@4x 4x"
-            />
-          </div>
-        </div>
-      </div>
-      <div
-        class="text-truncate text-dark fw-bold badgeContent"
-      >
-        <span>
-          Artifact Hub
-        </span>
-      </div>
-    </div>
-  </a>
-</DocumentFragment>
-`;
diff --git a/web/src/layout/package/OrgsUsingPackage/__snapshots__/index.test.tsx.snap b/web/src/layout/package/OrgsUsingPackage/__snapshots__/index.test.tsx.snap
deleted file mode 100644
index 7ab03f75d..000000000
--- a/web/src/layout/package/OrgsUsingPackage/__snapshots__/index.test.tsx.snap
+++ /dev/null
@@ -1,184 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`OrgsUsingPackage creates snapshot 1`] = `
-<DocumentFragment>
-  <div
-    class="mt-3 w-100 undefined"
-  >
-    <div
-      class="mb-2 w-100 text-nowrap"
-    >
-      <span
-        class="position-relative orgIcon"
-      >
-        <svg
-          fill="currentColor"
-          height="1em"
-          stroke="currentColor"
-          stroke-width="0"
-          viewBox="0 0 24 24"
-          width="1em"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M0 0h24v24H0z"
-            fill="none"
-          />
-          <path
-            d="M12 7V3H2v18h20V7H12zM6 19H4v-2h2v2zm0-4H4v-2h2v2zm0-4H4V9h2v2zm0-4H4V5h2v2zm4 12H8v-2h2v2zm0-4H8v-2h2v2zm0-4H8V9h2v2zm0-4H8V5h2v2zm10 12h-8v-2h2v-2h-2v-2h2v-2h-2V9h8v10zm-2-8h-2v2h2v-2zm0 4h-2v2h2v-2z"
-          />
-        </svg>
-      </span>
-      <small
-        class="text-muted ms-2"
-      >
-        Organizations using this package in production:
-      </small>
-      <small
-        class="fw-bold ms-2"
-      >
-        3
-      </small>
-      <button
-        aria-label="See all organizations using this package in production"
-        class="btn text-dark fw-bold btn-link btn-sm px-2 border-0 seeAllbtn"
-      >
-        (see all)
-      </button>
-    </div>
-    <div
-      class="d-flex flex-row pt-1"
-    >
-      <div
-        class="overflow-hidden w-100 content"
-      >
-        <div
-          class="d-flex flex-row flex-wrap align-items-center"
-        >
-          <a
-            aria-label="Open organization url"
-            class="link d-inline-block text-dark h5 mb-2 me-3"
-            href="https://artifacthub.io"
-            rel="noopener noreferrer"
-            role="button"
-            tabindex="-1"
-            target="_blank"
-          >
-            <div
-              class="badge badge-rounded bg-light text-dark rounded-pill d-flex flex-row align-items-center ps-0 pe-3 border badge"
-              data-testid="org-using-pkg"
-            >
-              <div
-                class="me-2"
-              >
-                <div
-                  class="rounded-circle border bg-white imageWrapper imageWrapper overflow-hidden"
-                >
-                  <div
-                    class="d-flex align-items-center justify-content-center w-100 h-100"
-                  >
-                    <img
-                      alt="Artifact Hub"
-                      aria-hidden="true"
-                      class="m-auto rounded-circle image"
-                      src="/image/35c5d3c7-421e-4b4a-97b0-86f4602a2f59"
-                      srcset="/image/35c5d3c7-421e-4b4a-97b0-86f4602a2f59@1x 1x, /image/35c5d3c7-421e-4b4a-97b0-86f4602a2f59@2x 2x, /image/35c5d3c7-421e-4b4a-97b0-86f4602a2f59@3x 3x, /image/35c5d3c7-421e-4b4a-97b0-86f4602a2f59@4x 4x"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div
-                class="text-truncate text-dark fw-bold badgeContent"
-              >
-                <span>
-                  Artifact Hub
-                </span>
-              </div>
-            </div>
-          </a>
-          <div
-            class="d-inline-block text-dark h5 mb-2 me-3"
-          >
-            <div
-              class="badge badge-rounded bg-light text-dark rounded-pill d-flex flex-row align-items-center ps-0 pe-3 border badge"
-              data-testid="org-using-pkg"
-            >
-              <div
-                class="me-2"
-              >
-                <div
-                  class="rounded-circle border bg-white imageWrapper imageWrapper overflow-hidden"
-                >
-                  <div
-                    class="d-flex align-items-center justify-content-center w-100 h-100"
-                  >
-                    <svg
-                      fill="currentColor"
-                      height="1em"
-                      stroke="currentColor"
-                      stroke-width="0"
-                      viewBox="0 0 24 24"
-                      width="1em"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M0 0h24v24H0z"
-                        fill="none"
-                      />
-                      <path
-                        d="M12 7V3H2v18h20V7H12zM6 19H4v-2h2v2zm0-4H4v-2h2v2zm0-4H4V9h2v2zm0-4H4V5h2v2zm4 12H8v-2h2v2zm0-4H8v-2h2v2zm0-4H8V9h2v2zm0-4H8V5h2v2zm10 12h-8v-2h2v-2h-2v-2h2v-2h-2V9h8v10zm-2-8h-2v2h2v-2zm0 4h-2v2h2v-2z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="text-truncate text-dark fw-bold badgeContent"
-              >
-                <span>
-                  test
-                </span>
-              </div>
-            </div>
-          </div>
-          <div
-            class="d-inline-block text-dark h5 mb-2 me-3"
-          >
-            <div
-              class="badge badge-rounded bg-light text-dark rounded-pill d-flex flex-row align-items-center ps-0 pe-3 border badge"
-              data-testid="org-using-pkg"
-            >
-              <div
-                class="me-2"
-              >
-                <div
-                  class="rounded-circle border bg-white imageWrapper imageWrapper overflow-hidden"
-                >
-                  <div
-                    class="d-flex align-items-center justify-content-center w-100 h-100"
-                  >
-                    <img
-                      alt="Organization"
-                      aria-hidden="true"
-                      class="m-auto rounded-circle image"
-                      src="/image/132543-jkhd8yeu-uyreiunbdnfsd-iuisdjfk"
-                      srcset="/image/132543-jkhd8yeu-uyreiunbdnfsd-iuisdjfk@1x 1x, /image/132543-jkhd8yeu-uyreiunbdnfsd-iuisdjfk@2x 2x, /image/132543-jkhd8yeu-uyreiunbdnfsd-iuisdjfk@3x 3x, /image/132543-jkhd8yeu-uyreiunbdnfsd-iuisdjfk@4x 4x"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div
-                class="text-truncate text-dark fw-bold badgeContent"
-              >
-                <span>
-                  Organization
-                </span>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</DocumentFragment>
-`;
diff --git a/web/src/layout/package/OrgsUsingPackage/index.test.tsx b/web/src/layout/package/OrgsUsingPackage/index.test.tsx
deleted file mode 100644
index 061681760..000000000
--- a/web/src/layout/package/OrgsUsingPackage/index.test.tsx
+++ /dev/null
@@ -1,116 +0,0 @@
-import { render, screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { BrowserRouter as Router } from 'react-router-dom';
-
-import OrgsUsingPackage from './index';
-
-jest.mock('../../../hooks/useOverflowWrapper', () => () => true);
-
-const defaultProps = {
-  organizations: [
-    {
-      name: 'artifacthub',
-      displayName: 'Artifact Hub',
-      homeUrl: 'https://artifacthub.io',
-      logoImageId: '35c5d3c7-421e-4b4a-97b0-86f4602a2f59',
-    },
-    {
-      name: 'test',
-    },
-    {
-      name: 'org-name',
-      displayName: 'Organization',
-      logoImageId: '132543-jkhd8yeu-uyreiunbdnfsd-iuisdjfk',
-    },
-  ],
-};
-
-describe('OrgsUsingPackage', () => {
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-  it('creates snapshot', () => {
-    const { asFragment } = render(
-      <Router>
-        <OrgsUsingPackage {...defaultProps} />
-      </Router>
-    );
-    expect(asFragment()).toMatchSnapshot();
-  });
-
-  describe('Render', () => {
-    it('renders component', () => {
-      render(
-        <Router>
-          <OrgsUsingPackage {...defaultProps} />
-        </Router>
-      );
-
-      expect(screen.getByText(/using this package in production/)).toBeInTheDocument();
-
-      const orgs = screen.getAllByTestId('org-using-pkg');
-      expect(orgs).toHaveLength(3);
-      expect(orgs[0]).toHaveTextContent('Artifact Hub');
-      expect(orgs[1]).toHaveTextContent('test');
-      expect(orgs[2]).toHaveTextContent('Organization');
-
-      const link = screen.getByRole('button', { name: 'Open organization url' });
-      expect(link).toBeInTheDocument();
-      expect(link).toHaveAttribute('href', 'https://artifacthub.io');
-    });
-
-    it('opens modal after clicking see all btn', async () => {
-      render(
-        <Router>
-          <OrgsUsingPackage {...defaultProps} />
-        </Router>
-      );
-
-      expect(screen.getByText(/using this package in production/)).toBeInTheDocument();
-
-      const btn = screen.getByRole('button', { name: 'See all organizations using this package in production' });
-      expect(btn).toBeInTheDocument();
-      await userEvent.click(btn);
-
-      await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument();
-      });
-    });
-
-    it('closes modal - see all', async () => {
-      render(
-        <Router>
-          <OrgsUsingPackage {...defaultProps} />
-        </Router>
-      );
-
-      expect(screen.getByText(/using this package in production/)).toBeInTheDocument();
-
-      const btn = screen.getByRole('button', { name: 'See all organizations using this package in production' });
-      expect(btn).toBeInTheDocument();
-      await userEvent.click(btn);
-
-      expect(screen.getByRole('dialog')).toBeInTheDocument();
-
-      const closeBtn = screen.getByRole('button', { name: 'Close' });
-      await userEvent.click(closeBtn);
-
-      await waitFor(() => {
-        expect(screen.queryByRole('dialog')).toBeNull();
-      });
-    });
-
-    describe('does not render component', () => {
-      it('when orgs list is empty', () => {
-        const { container } = render(
-          <Router>
-            <OrgsUsingPackage organizations={[]} />
-          </Router>
-        );
-
-        expect(container).toBeEmptyDOMElement();
-      });
-    });
-  });
-});
diff --git a/web/src/layout/package/OrgsUsingPackage/index.tsx b/web/src/layout/package/OrgsUsingPackage/index.tsx
deleted file mode 100644
index cfe227d05..000000000
--- a/web/src/layout/package/OrgsUsingPackage/index.tsx
+++ /dev/null
@@ -1,132 +0,0 @@
-import { sortBy } from 'lodash';
-import { useEffect, useRef, useState } from 'react';
-import { FiExternalLink } from 'react-icons/fi';
-import { MdBusiness } from 'react-icons/md';
-
-import useOverflowWrapper from '../../../hooks/useOverflowWrapper';
-import { Organization } from '../../../types';
-import ExternalLink from '../../common/ExternalLink';
-import Image from '../../common/Image';
-import Modal from '../../common/Modal';
-import OrgCard from './Card';
-import styles from './OrgsUsingPackage.module.css';
-
-interface Props {
-  organizations: Organization[];
-  className?: string;
-}
-
-const MAX_HEIGHT = 35;
-const MAX_ITEMS_NUMBER = 16;
-
-const OrgsUsingPackage = (props: Props) => {
-  const wrapper = useRef<HTMLDivElement | null>(null);
-  const overflow = useOverflowWrapper(wrapper, MAX_HEIGHT, props.organizations.length);
-  const [openStatus, setOpenStatus] = useState<boolean>(false);
-  const [sortedOrgs, setSortedOrgs] = useState<Organization[]>([]);
-
-  useEffect(() => {
-    setSortedOrgs(sortBy(props.organizations, (org: Organization) => org.displayName || org.name));
-  }, [props.organizations]);
-
-  useEffect(() => {
-    if (!overflow && openStatus) {
-      setOpenStatus(false);
-    }
-  }, [overflow]); /* eslint-disable-line react-hooks/exhaustive-deps */
-
-  if (props.organizations.length === 0) return null;
-
-  const getInfoCell = (org: Organization) => {
-    return (
-      <div className="d-flex flex-row align-items-center">
-        <div className={`rounded-circle border bg-white ${styles.imageWrapper} imageWrapper overflow-hidden me-2`}>
-          <div className="d-flex align-items-center justify-content-center w-100 h-100">
-            <Image
-              alt={org.displayName || org.name}
-              imageId={org.logoImageId}
-              className={`m-auto ${styles.image}`}
-              placeholderIcon={<MdBusiness />}
-            />
-          </div>
-        </div>
-        <div className="text-truncate ps-1">{org.displayName || org.name}</div>
-
-        {org.homeUrl && (
-          <small className="ms-2">
-            <FiExternalLink />
-          </small>
-        )}
-      </div>
-    );
-  };
-
-  return (
-    <div className={`mt-3 w-100 ${props.className}`}>
-      <div className="mb-2 w-100 text-nowrap">
-        <span className={`position-relative ${styles.orgIcon}`}>
-          <MdBusiness />
-        </span>
-        <small className="text-muted ms-2">Organizations using this package in production:</small>
-        <small className="fw-bold ms-2">{props.organizations.length}</small>
-        {(overflow || props.organizations.length > MAX_ITEMS_NUMBER) && (
-          <button
-            className={`btn text-dark fw-bold btn-link btn-sm px-2 border-0 ${styles.seeAllbtn}`}
-            onClick={() => setOpenStatus(true)}
-            aria-label="See all organizations using this package in production"
-          >
-            (see all)
-          </button>
-        )}
-      </div>
-
-      <div className="d-flex flex-row pt-1">
-        <div className={`overflow-hidden w-100 ${styles.content}`}>
-          <div ref={wrapper} className="d-flex flex-row flex-wrap align-items-center">
-            {props.organizations.slice(0, MAX_ITEMS_NUMBER).map((org: Organization) => (
-              <OrgCard key={`org_${org.name}`} organization={org} />
-            ))}
-          </div>
-        </div>
-      </div>
-
-      {openStatus && overflow && (
-        <Modal
-          modalDialogClassName={styles.modalDialog}
-          modalClassName={styles.modal}
-          header={<div className={`h3 m-2 flex-grow-1 ${styles.title}`}>Organizations using this package</div>}
-          onClose={() => setOpenStatus(false)}
-          open={openStatus}
-        >
-          <div className="my-3 mw-100">
-            <table className={`table table-striped table-bordered table-sm mb-0 ${styles.table}`}>
-              <tbody className={styles.body}>
-                {sortedOrgs.map((org: Organization) => {
-                  return (
-                    <tr key={`org-${org.name}`}>
-                      <td>
-                        {org.homeUrl ? (
-                          <ExternalLink
-                            href={org.homeUrl}
-                            className="text-decoration-none text-reset"
-                            label="Open organization url"
-                          >
-                            <>{getInfoCell(org)}</>
-                          </ExternalLink>
-                        ) : (
-                          <>{getInfoCell(org)}</>
-                        )}
-                      </td>
-                    </tr>
-                  );
-                })}
-              </tbody>
-            </table>
-          </div>
-        </Modal>
-      )}
-    </div>
-  );
-};
-
-export default OrgsUsingPackage;
diff --git a/web/src/layout/package/Stats.test.tsx b/web/src/layout/package/Stats.test.tsx
index 6e4103dff..e471571d2 100644
--- a/web/src/layout/package/Stats.test.tsx
+++ b/web/src/layout/package/Stats.test.tsx
@@ -7,6 +7,7 @@ const defaultProps = {
     subscriptions: 12,
     webhooks: 8,
   },
+  productionOrganizationsCount: 3,
 };
 
 describe('Stats', () => {
@@ -22,38 +23,66 @@ describe('Stats', () => {
   describe('Render', () => {
     it('renders component', () => {
       render(<Stats {...defaultProps} />);
+      expect(screen.getByTestId('subscriptions')).toBeInTheDocument();
       expect(screen.getByText('Subscriptions:')).toBeInTheDocument();
       expect(screen.getByText('12')).toBeInTheDocument();
+      expect(screen.getByTestId('webhooks')).toBeInTheDocument();
       expect(screen.getByText('Webhooks:')).toBeInTheDocument();
       expect(screen.getByText('8')).toBeInTheDocument();
+      expect(screen.getByTestId('productionUsers')).toBeInTheDocument();
+      expect(screen.getByText('Production users:')).toBeInTheDocument();
+      expect(screen.getByText('3')).toBeInTheDocument();
     });
 
     it('renders only subscriptions', () => {
       render(<Stats packageStats={{ subscriptions: 3, webhooks: 0 }} />);
+      expect(screen.getByTestId('subscriptions')).toBeInTheDocument();
       expect(screen.getByText('Subscriptions:')).toBeInTheDocument();
       expect(screen.getByText('3')).toBeInTheDocument();
+      expect(screen.queryByTestId('webhooks')).toBeNull();
       expect(screen.queryByText('Webhooks:')).toBeNull();
       expect(screen.queryByText('0')).toBeNull();
+      expect(screen.queryByTestId('productionUsers')).toBeNull();
     });
 
     it('renders only webhooks', () => {
       render(<Stats packageStats={{ subscriptions: 0, webhooks: 5 }} />);
+      expect(screen.queryByTestId('subscriptions')).toBeNull();
       expect(screen.queryByText('Subscriptions:')).toBeNull();
       expect(screen.queryByText('0')).toBeNull();
+      expect(screen.getByTestId('webhooks')).toBeInTheDocument();
       expect(screen.getByText('Webhooks:')).toBeInTheDocument();
       expect(screen.getByText('5')).toBeInTheDocument();
+      expect(screen.queryByTestId('productionUsers')).toBeNull();
+    });
+
+    it('renders only production users', () => {
+      render(<Stats packageStats={{ subscriptions: 0, webhooks: 0 }} productionOrganizationsCount={5} />);
+
+      expect(screen.queryByTestId('subscriptions')).toBeNull();
+      expect(screen.queryByTestId('webhooks')).toBeNull();
+      expect(screen.getByTestId('productionUsers')).toBeInTheDocument();
+      expect(screen.getByText('Production users:')).toBeInTheDocument();
+      expect(screen.getByText('5')).toBeInTheDocument();
     });
   });
 
-  describe('does not render section', () => {
-    it('when packegeStats in undefined', () => {
+  describe('does not render section or part of section', () => {
+    it('when packageStats and productionOrganizationsCount are undefined', () => {
       const { container } = render(<Stats />);
+
+      expect(screen.queryByTestId('subscriptions')).toBeNull();
+      expect(screen.queryByTestId('webhooks')).toBeNull();
+      expect(screen.queryByTestId('productionUsers')).toBeNull();
       expect(container).toBeEmptyDOMElement();
     });
 
-    it('when both values are 0', () => {
-      const { container } = render(<Stats packageStats={{ subscriptions: 0, webhooks: 0 }} />);
-      expect(container).toBeEmptyDOMElement();
+    it('when all values are 0', () => {
+      render(<Stats packageStats={{ subscriptions: 0, webhooks: 0 }} productionOrganizationsCount={0} />);
+
+      expect(screen.queryByTestId('subscriptions')).toBeNull();
+      expect(screen.queryByTestId('webhooks')).toBeNull();
+      expect(screen.queryByTestId('productionUsers')).toBeNull();
     });
   });
 });
diff --git a/web/src/layout/package/Stats.tsx b/web/src/layout/package/Stats.tsx
index de559911f..0531bfa99 100644
--- a/web/src/layout/package/Stats.tsx
+++ b/web/src/layout/package/Stats.tsx
@@ -1,6 +1,7 @@
 import { isUndefined } from 'lodash';
 import { FaUser } from 'react-icons/fa';
 import { GrConnect } from 'react-icons/gr';
+import { MdBusiness } from 'react-icons/md';
 
 import { PackageStats } from '../../types';
 import prettifyNumber from '../../utils/prettifyNumber';
@@ -8,27 +9,39 @@ import styles from './Stats.module.css';
 
 interface Props {
   packageStats?: PackageStats;
+  productionOrganizationsCount?: number;
 }
 
 const Stats = (props: Props) => {
-  if (isUndefined(props.packageStats) || (props.packageStats.subscriptions === 0 && props.packageStats.webhooks === 0))
-    return null;
+  if (isUndefined(props.packageStats) && isUndefined(props.productionOrganizationsCount)) return null;
 
   return (
-    <div className="d-flex flex-row align-items-baseline mt-2">
-      {props.packageStats.subscriptions > 0 && (
-        <div className="d-flex flex-row align-items-baseline me-3">
-          <FaUser className={styles.icon} />
-          <small className="text-muted text-uppercase mx-1">Subscriptions:</small>
-          <span className="fw-bold">{prettifyNumber(props.packageStats.subscriptions)}</span>
-        </div>
+    <div className="d-flex flex-row flex-wrap align-items-baseline">
+      {!isUndefined(props.packageStats) && (
+        <>
+          {props.packageStats.subscriptions > 0 && (
+            <div data-testid="subscriptions" className="d-flex flex-row align-items-baseline me-3 mt-2">
+              <FaUser className={styles.icon} />
+              <small className="text-muted text-uppercase mx-1">Subscriptions:</small>
+              <span className="fw-bold">{prettifyNumber(props.packageStats.subscriptions)}</span>
+            </div>
+          )}
+
+          {props.packageStats.webhooks > 0 && (
+            <div data-testid="webhooks" className="d-flex flex-row align-items-baseline me-3 mt-2">
+              <GrConnect className={styles.icon} />
+              <small className="text-muted text-uppercase mx-1">Webhooks:</small>
+              <span className="fw-bold">{prettifyNumber(props.packageStats.webhooks)}</span>
+            </div>
+          )}
+        </>
       )}
 
-      {props.packageStats.webhooks > 0 && (
-        <div className="d-flex flex-row align-items-baseline">
-          <GrConnect className={styles.icon} />
-          <small className="text-muted text-uppercase mx-1">Webhooks:</small>
-          <span className="fw-bold">{prettifyNumber(props.packageStats.webhooks)}</span>
+      {!isUndefined(props.productionOrganizationsCount) && props.productionOrganizationsCount > 0 && (
+        <div data-testid="productionUsers" className="d-none d-md-flex flex-row align-items-baseline mt-2">
+          <MdBusiness className={styles.icon} />
+          <small className="text-muted text-uppercase mx-1">Production users:</small>
+          <span className="fw-bold">{prettifyNumber(props.productionOrganizationsCount)}</span>
         </div>
       )}
     </div>
diff --git a/web/src/layout/package/__fixtures__/index/17.json b/web/src/layout/package/__fixtures__/index/17.json
deleted file mode 100644
index fd6fc1384..000000000
--- a/web/src/layout/package/__fixtures__/index/17.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "packageId": "id",
-  "name": "test",
-  "displayName": "Pretty name",
-  "description": "desc",
-  "logoImageId": "imageId",
-  "appVersion": "1.0.0",
-  "normalizedName": "pr",
-  "deprecated": false,
-  "isOperator": false,
-  "keywords": ["key1", "key2"],
-  "productionOrganizations": [
-    {
-      "name": "artifacthub",
-      "displayName": "Artifact Hub",
-      "homeUrl": "https://artifacthub.io",
-      "logoImageId": "35c5d3c7-421e-4b4a-97b0-86f4602a2f59"
-    },
-    {
-      "name": "test"
-    },
-    {
-      "name": "org-name",
-      "displayName": "Organization",
-      "logoImageId": "132543-jkhd8yeu-uyreiunbdnfsd-iuisdjfk"
-    }
-  ],
-  "repository": {
-    "repositoryid": "id",
-    "kind": 0,
-    "name": "incubator",
-    "organizationName": "helm",
-    "organizationDisplayName": "Helm",
-    "url": "https://repo.url",
-    "private": false
-  }
-}
diff --git a/web/src/layout/package/__snapshots__/Stats.test.tsx.snap b/web/src/layout/package/__snapshots__/Stats.test.tsx.snap
index 9f7c5a516..a76cd0eab 100644
--- a/web/src/layout/package/__snapshots__/Stats.test.tsx.snap
+++ b/web/src/layout/package/__snapshots__/Stats.test.tsx.snap
@@ -3,10 +3,11 @@
 exports[`Stats creates snapshot 1`] = `
 <DocumentFragment>
   <div
-    class="d-flex flex-row align-items-baseline mt-2"
+    class="d-flex flex-row flex-wrap align-items-baseline"
   >
     <div
-      class="d-flex flex-row align-items-baseline me-3"
+      class="d-flex flex-row align-items-baseline me-3 mt-2"
+      data-testid="subscriptions"
     >
       <svg
         class="icon"
@@ -34,7 +35,8 @@ exports[`Stats creates snapshot 1`] = `
       </span>
     </div>
     <div
-      class="d-flex flex-row align-items-baseline"
+      class="d-flex flex-row align-items-baseline me-3 mt-2"
+      data-testid="webhooks"
     >
       <svg
         class="icon"
@@ -64,6 +66,39 @@ exports[`Stats creates snapshot 1`] = `
         8
       </span>
     </div>
+    <div
+      class="d-none d-md-flex flex-row align-items-baseline mt-2"
+      data-testid="productionUsers"
+    >
+      <svg
+        class="icon"
+        fill="currentColor"
+        height="1em"
+        stroke="currentColor"
+        stroke-width="0"
+        viewBox="0 0 24 24"
+        width="1em"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M0 0h24v24H0z"
+          fill="none"
+        />
+        <path
+          d="M12 7V3H2v18h20V7H12zM6 19H4v-2h2v2zm0-4H4v-2h2v2zm0-4H4V9h2v2zm0-4H4V5h2v2zm4 12H8v-2h2v2zm0-4H8v-2h2v2zm0-4H8V9h2v2zm0-4H8V5h2v2zm10 12h-8v-2h2v-2h-2v-2h2v-2h-2V9h8v10zm-2-8h-2v2h2v-2zm0 4h-2v2h2v-2z"
+        />
+      </svg>
+      <small
+        class="text-muted text-uppercase mx-1"
+      >
+        Production users:
+      </small>
+      <span
+        class="fw-bold"
+      >
+        3
+      </span>
+    </div>
   </div>
 </DocumentFragment>
 `;
diff --git a/web/src/layout/package/index.test.tsx b/web/src/layout/package/index.test.tsx
index e6744205e..8b4a3b39b 100644
--- a/web/src/layout/package/index.test.tsx
+++ b/web/src/layout/package/index.test.tsx
@@ -10,7 +10,7 @@ import PackageView from './index';
 jest.mock('../../api');
 jest.mock('../../utils/updateMetaIndex');
 jest.mock('react-apexcharts', () => () => <div>Chart</div>);
-jest.mock('react-markdown', () => (props) => {
+jest.mock('react-markdown', () => (props: any) => {
   return <>{props.children}</>;
 });
 jest.mock('remark-gfm', () => () => <div />);
@@ -587,34 +587,6 @@ describe('Package index', () => {
       expect(pkgs[1]).toHaveTextContent('kube-prometheus-stack');
     });
 
-    it('renders orgs using package', async () => {
-      const mockPackage = getMockPackage('17');
-      mocked(API).getPackage.mockResolvedValue(mockPackage);
-
-      render(
-        <Router>
-          <PackageView {...defaultProps} />
-        </Router>
-      );
-
-      await waitFor(() => {
-        expect(API.getPackage).toHaveBeenCalledTimes(1);
-      });
-
-      expect(await screen.findByTestId('more-details-section')).toBeInTheDocument();
-      expect(screen.getByText(/Organizations using this package in production/)).toBeInTheDocument();
-
-      const orgs = screen.getAllByTestId('org-using-pkg');
-      expect(orgs).toHaveLength(3);
-      expect(orgs[0]).toHaveTextContent('Artifact Hub');
-      expect(orgs[1]).toHaveTextContent('test');
-      expect(orgs[2]).toHaveTextContent('Organization');
-
-      const link = screen.getByRole('button', { name: 'Open organization url' });
-      expect(link).toBeInTheDocument();
-      expect(link).toHaveAttribute('href', 'https://artifacthub.io');
-    });
-
     it('does not render when recommended and production usage are undefined', async () => {
       const mockPackage = getMockPackage('18');
       mocked(API).getPackage.mockResolvedValue(mockPackage);
diff --git a/web/src/layout/package/index.tsx b/web/src/layout/package/index.tsx
index e61b72805..a497da496 100644
--- a/web/src/layout/package/index.tsx
+++ b/web/src/layout/package/index.tsx
@@ -57,7 +57,6 @@ import InProductionButton from './InProductionButton';
 import InstallationModal from './installation/Modal';
 import ModalHeader from './ModalHeader';
 import MoreActionsButton from './MoreActionsButton';
-import OrgsUsingPackage from './OrgsUsingPackage';
 import styles from './PackageView.module.css';
 import PackagesViewsStats from './PackageViewsStats';
 import ReadmeWrapper from './readme';
@@ -283,27 +282,15 @@ const PackageView = (props: Props) => {
   const renderMoreDetails = (): JSX.Element | null => {
     if (detail) {
       const recommendations = detail.recommendations && detail.recommendations.length > 0;
-      const orgsUsingPkg = detail.productionOrganizations && detail.productionOrganizations.length > 0;
 
-      if (recommendations || orgsUsingPkg) {
+      if (recommendations) {
         return (
           <div
             data-testid="more-details-section"
             className={`d-none d-md-block px-3 ${styles.moreDetailsSectionWrapper}`}
           >
             <div className="container-lg px-sm-4 px-lg-0 py-2 d-flex flex-column position-relative">
-              {orgsUsingPkg && (
-                <OrgsUsingPackage
-                  organizations={detail.productionOrganizations!}
-                  className={recommendations ? 'mb-2' : 'mb-3'}
-                />
-              )}
-              {recommendations && (
-                <RecommendedPackages
-                  recommendations={detail.recommendations}
-                  className={orgsUsingPkg ? 'mt-2' : 'mt-3'}
-                />
-              )}
+              {recommendations && <RecommendedPackages recommendations={detail.recommendations} className="mt-3" />}
             </div>
           </div>
         );
@@ -710,7 +697,10 @@ const PackageView = (props: Props) => {
 
                     <p className={`mb-0 overflow-hidden text-break ${styles.description}`}>{detail.description}</p>
 
-                    <Stats packageStats={detail.stats} />
+                    <Stats
+                      packageStats={detail.stats}
+                      productionOrganizationsCount={detail.productionOrganizationsCount}
+                    />
 
                     <div className="d-flex flex-wrap d-md-none">{getBadges(true, 'mt-3 mt-md-0')}</div>
 
diff --git a/web/src/types.ts b/web/src/types.ts
index ad71426f2..b33b9bc44 100644
--- a/web/src/types.ts
+++ b/web/src/types.ts
@@ -118,7 +118,6 @@ export interface Package {
   signKey?: HelmChartSignKey;
   signatures?: Signature[];
   screenshots?: Screenshot[];
-  productionOrganizations?: Organization[];
   productionOrganizationsCount?: number;
 }