diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/search-externe-fachstelle-container/search-externe-fachstelle-container.component.html b/alfa-client/libs/zustaendige-stelle/src/lib/search-externe-fachstelle-container/search-externe-fachstelle-container.component.html
index 041d3b4727c3e5b0f98bbd537a70a7e74134b8b3..c3e48e9305999ee9f845f56ec608ef9f256d03b2 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/search-externe-fachstelle-container/search-externe-fachstelle-container.component.html
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/search-externe-fachstelle-container/search-externe-fachstelle-container.component.html
@@ -1,7 +1,7 @@
 <ng-container *ngIf="externeFachstelleResource$ | async as externeFachstelleResource; else searchButton">
-  <alfa-zustaendige-stelle-header title="Externe Fachstelle" [subTitle]="externeFachstelleResource.name">
+  <alfa-zustaendige-stelle-header title="Externe Fachstelle" [subTitle]="externeFachstelleResource.name" [isSubTitleBold]="true">
     <ods-external-unit-icon icon />
-    <div class="flex flex-col text-sm text-text" info>
+    <div class="flex flex-1 flex-col text-sm text-text" info>
       <p>{{ externeFachstelleResource.anschrift }}</p>
       <p>{{ 'Email: ' + externeFachstelleResource.email }}</p>
     </div>
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/search-organisations-einheit-container/organisations-einheit/organisations-einheit.component.html b/alfa-client/libs/zustaendige-stelle/src/lib/search-organisations-einheit-container/organisations-einheit/organisations-einheit.component.html
index c2185aebc48ffdd74b884bd58109b13259ae513e..4dfc708d600fb2f0e9691666cc22cdcc82a9693c 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/search-organisations-einheit-container/organisations-einheit/organisations-einheit.component.html
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/search-organisations-einheit-container/organisations-einheit/organisations-einheit.component.html
@@ -1 +1 @@
-<p class="text-base text-text">{{ address }}</p>
+<p class="text-sm text-text">{{ address }}</p>
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/search-organisations-einheit-container/search-organisations-einheit-container.component.html b/alfa-client/libs/zustaendige-stelle/src/lib/search-organisations-einheit-container/search-organisations-einheit-container.component.html
index 25fadc812bc43b27ef8c52c1e84e08587ffbceee..77443b9e24d398ace9485cfaa0a2a71bb83266c7 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/search-organisations-einheit-container/search-organisations-einheit-container.component.html
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/search-organisations-einheit-container/search-organisations-einheit-container.component.html
@@ -1,9 +1,14 @@
 <ng-container *ngIf="organisationsEinheitResource$ | async as organisationsEinheitResource; else searchButton">
-  <alfa-zustaendige-stelle-header title="Öffentliche Verwaltung" [subTitle]="organisationsEinheitResource.name">
+  <alfa-zustaendige-stelle-header
+    title="Öffentliche Verwaltung"
+    [subTitle]="organisationsEinheitResource.name"
+    [isSubTitleBold]="true"
+  >
     <ods-public-administration-icon icon />
     <alfa-organisations-einheit
       data-test-id="organisations-einheit-in-collaboration"
       [organisationsEinheitResource]="organisationsEinheitResource"
+      class="flex-1"
       info
     />
     <alfa-edit-zustaendige-stelle-button title="Zuständige Stelle auswählen" dataTestId="edit-organisations-einheit-button" />
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle-header/zustaendige-stelle-header.component.html b/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle-header/zustaendige-stelle-header.component.html
index 951400884e04237589b740ab5d808bbe76d5e5d3..eda66df0206c64ce27affabd18339fa0933e2689 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle-header/zustaendige-stelle-header.component.html
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle-header/zustaendige-stelle-header.component.html
@@ -1,9 +1,11 @@
-<div class="flex justify-between">
-  <div class="flex gap-3">
+<div class="flex">
+  <div class="flex flex-1 gap-3">
     <ng-content select="[icon]" />
-    <div class="flex flex-col text-base">
+    <div class="flex flex-1 flex-col text-base">
       <p class="text-primary" data-test-id="zustaendige-stelle-header-title">{{ title }}</p>
-      <p class="text-text" data-test-id="zustaendige-stelle-header-sub-title">{{ subTitle }}</p>
+      <p class="text-text" [class.font-medium]="isSubTitleBold" data-test-id="zustaendige-stelle-header-sub-title">
+        {{ subTitle }}
+      </p>
     </div>
     <ng-content select="[info]" />
   </div>
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle-header/zustaendige-stelle-header.component.spec.ts b/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle-header/zustaendige-stelle-header.component.spec.ts
index 5b819aa9107be8498ca0db9a23ee1456d59b8404..a9f48ee516c4a0a1419de895de4d0ba201dbf495 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle-header/zustaendige-stelle-header.component.spec.ts
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle-header/zustaendige-stelle-header.component.spec.ts
@@ -45,5 +45,27 @@ describe('ZustaendigeStelleHeaderComponent', () => {
         expect(subTitleElement.innerHTML).toContain('I am test sub title');
       });
     });
+
+    describe('isSubTitleBold', () => {
+      it('should add class if true', () => {
+        component.subTitle = 'I am test sub title';
+        component.isSubTitleBold = true;
+        fixture.detectChanges();
+
+        const subTitleElement: HTMLElement = getElementFromFixture(fixture, subTitleSelector);
+
+        expect(subTitleElement.classList).toContain('font-medium');
+      });
+
+      it('should not add class if false', () => {
+        component.subTitle = 'I am test sub title';
+        component.isSubTitleBold = false;
+        fixture.detectChanges();
+
+        const subTitleElement: HTMLElement = getElementFromFixture(fixture, subTitleSelector);
+
+        expect(subTitleElement.classList).not.toContain('font-medium');
+      });
+    });
   });
 });
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle-header/zustaendige-stelle-header.component.ts b/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle-header/zustaendige-stelle-header.component.ts
index 167c08a22df02443f9aa2a289d08e575650e517c..1315d4eb444c2ee5e27976a762ef934a9b8bedc0 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle-header/zustaendige-stelle-header.component.ts
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle-header/zustaendige-stelle-header.component.ts
@@ -7,4 +7,5 @@ import { Component, Input } from '@angular/core';
 export class ZustaendigeStelleHeaderComponent {
   @Input() title: string;
   @Input() subTitle: string;
+  @Input() isSubTitleBold: boolean = false;
 }