diff --git a/src/pages/community/profiles/[id].tsx b/src/pages/community/profiles/[id].tsx
index 40c27d06f2d7..8d7926de1584 100644
--- a/src/pages/community/profiles/[id].tsx
+++ b/src/pages/community/profiles/[id].tsx
@@ -733,11 +733,11 @@ const LikedPosts = ({ profileID }) => {
     )
 }
 
-const Block = ({ title, children, url }) => {
+const Block = ({ title, children, url, className }) => {
     return (
         <Fieldset
             data-scheme="secondary"
-            className="bg-primary"
+            className={`bg-primary ${className}`}
             legend={
                 url ? (
                     <Link className="font-semibold group" to={url} state={{ newWindow: true }}>
@@ -1381,54 +1381,48 @@ export default function ProfilePage({ params }: PageProps) {
                                 errors={errors}
                                 setFieldValue={setFieldValue}
                             />
-                            <div className="mt-6">
-                                {profile.teams?.data?.length > 0 &&
-                                    profile.teams.data[0].attributes.profiles?.data?.length > 0 && (
-                                        <Block
-                                            title={`${team.attributes.name} Team`}
-                                            url={`/teams/${team.attributes.slug}`}
-                                        >
-                                            <div className="grid grid-cols-2 gap-3 @lg:grid-cols-3 @3xl:grid-cols-4 pt-8">
-                                                {team.attributes.profiles.data
-                                                    .filter((teammate) => teammate.id !== data?.id)
-                                                    .map((teammate) => {
-                                                        return (
-                                                            <Link
-                                                                key={teammate.id}
-                                                                to={`/community/profiles/${teammate.id}`}
-                                                                state={{ newWindow: true }}
-                                                            >
-                                                                <TeamMember
-                                                                    avatar={{
-                                                                        url:
-                                                                            teammate.attributes.avatar?.data?.attributes
-                                                                                ?.url ||
-                                                                            teammate.attributes.avatar?.url,
-                                                                    }}
-                                                                    firstName={teammate.attributes.firstName}
-                                                                    lastName={teammate.attributes.lastName}
-                                                                    companyRole={teammate.attributes.companyRole}
-                                                                    country={teammate.attributes.country}
-                                                                    location={teammate.attributes.location}
-                                                                    squeakId={teammate.id}
-                                                                    color={teammate.attributes.color || 'yellow'}
-                                                                    biography={teammate.attributes.biography || ''}
-                                                                    teamCrestMap={teamCrestMap}
-                                                                    pineappleOnPizza={
-                                                                        teammate.attributes.pineappleOnPizza
-                                                                    }
-                                                                    startDate={teammate.attributes.startDate}
-                                                                    isTeamLead={team.attributes?.leadProfiles?.data?.some(
-                                                                        ({ id: leadID }) => leadID === teammate.id
-                                                                    )}
-                                                                />
-                                                            </Link>
-                                                        )
-                                                    })}
-                                            </div>
-                                        </Block>
-                                    )}
-                            </div>
+                            {profile?.teams?.data?.length === 1 ? (
+                                // Single team - use Block (OSFieldset)
+                                <div className="mt-6">
+                                    <Block
+                                        title={`${profile.teams.data[0].attributes.name} Team`}
+                                        url={`/teams/${profile.teams.data[0].attributes.slug}`}
+                                        className="pt-6"
+                                    >
+                                        <div className="grid grid-cols-2 gap-3 @lg:grid-cols-3 @3xl:grid-cols-4 pt-8">
+                                            <TeamMembersList self={data} team={profile.teams.data[0]} />
+                                        </div>
+                                    </Block>
+                                </div>
+                            ) : profile?.teams?.data?.length > 1 ? (
+                                // Multiple teams - use OSTabs
+                                <div className="mt-6" data-scheme="secondary">
+                                    <OSTabs
+                                        tabs={profile.teams.data.map((team) => ({
+                                            value: team.attributes.slug,
+                                            label: <>{team.attributes.name} Team</>,
+                                            content: (
+                                                <div className="grid grid-cols-2 gap-3 @lg:grid-cols-3 @3xl:grid-cols-4">
+                                                    <div className="col-span-full border-b border-primary pb-2 mb-10">
+                                                        <Link
+                                                            to={`/teams/${team.attributes.slug}`}
+                                                            state={{ newWindow: true }}
+                                                            className="group font-bold flex items-center gap-1 hover:underline"
+                                                        >
+                                                            {team.attributes.name} Team
+                                                            <IconArrowUpRight className="size-3 text-muted group-hover:text-secondary" />
+                                                        </Link>
+                                                    </div>
+                                                    <TeamMembersList self={data} team={team} />
+                                                </div>
+                                            ),
+                                        }))}
+                                        defaultValue={profile.teams.data[0].attributes.slug}
+                                        triggerDataScheme="primary"
+                                    />
+                                </div>
+                            ) : null}
+
                             {profile.amaEnabled && (
                                 <div className="mt-6">
                                     <Block title="Comments">
@@ -1451,6 +1445,43 @@ export default function ProfilePage({ params }: PageProps) {
     )
 }
 
+const TeamMembersList = ({ self, team }) => {
+    const selfTeammate = team.attributes.profiles.data.find((teammate) => teammate.id === self.id)
+    const otherTeammates = team.attributes.profiles.data.filter((teammate) => teammate.id !== self.id)
+    const teammates = [selfTeammate, ...otherTeammates].filter(Boolean)
+
+    return (
+        <>
+            {teammates.map((teammate) => {
+                return (
+                    <Link key={teammate.id} to={`/community/profiles/${teammate.id}`} state={{ newWindow: true }}>
+                        <TeamMember
+                            avatar={{
+                                url:
+                                    teammate.attributes.avatar?.data?.attributes?.url ||
+                                    teammate.attributes.avatar?.url,
+                            }}
+                            firstName={teammate.attributes.firstName}
+                            lastName={teammate.attributes.lastName}
+                            companyRole={teammate.attributes.companyRole}
+                            country={teammate.attributes.country}
+                            location={teammate.attributes.location}
+                            squeakId={teammate.id}
+                            color={teammate.attributes.color || 'yellow'}
+                            biography={teammate.attributes.biography || ''}
+                            pineappleOnPizza={teammate.attributes.pineappleOnPizza}
+                            startDate={teammate.attributes.startDate}
+                            isTeamLead={team.attributes?.leadProfiles?.data?.some(
+                                ({ id: leadID }) => leadID === teammate.id
+                            )}
+                        />
+                    </Link>
+                )
+            })}
+        </>
+    )
+}
+
 const Achievement = ({ title, description, image, icon, id, mutate, profile, ...other }) => {
     const { user, getJwt } = useUser()
     const [hidden, setHidden] = useState(other.hidden)