diff --git a/Jenkinsfile.admin b/Jenkinsfile.admin
index 4547c416b6a4e0b4820d716567f6fc1b0bc4d107..2627850666869ee6971dd977ccb41c7dc3167840 100644
--- a/Jenkinsfile.admin
+++ b/Jenkinsfile.admin
@@ -71,10 +71,10 @@ pipeline {
 
                     tagAndPushDockerImage(IMAGE_TAG)
 
-                    if (env.BRANCH_NAME == 'master') {
+                    if (isMasterBranch()) {
                         tagAndPushDockerImage('snapshot-latest')
                     }
-                    else if (env.BRANCH_NAME == 'release') {
+                    else if (isReleaseBranch()) {
                         tagAndPushDockerImage('latest')
                     }
                 }
@@ -147,7 +147,7 @@ pipeline {
 
 
 Boolean isReleaseBranch() {
-    return env.BRANCH_NAME == 'release'
+    return env.BRANCH_NAME == 'release-admin'
 }
 
 String generateImageTag() {
diff --git a/alfa-client/libs/postfach-shared/src/lib/+state/postfach.facade.ts b/alfa-client/libs/postfach-shared/src/lib/+state/postfach.facade.ts
index 423bbc52e53864dd9638e3eefa0de63edc984476..56950c2a7e0a3ea85cee1f71151156a13f72d3de 100644
--- a/alfa-client/libs/postfach-shared/src/lib/+state/postfach.facade.ts
+++ b/alfa-client/libs/postfach-shared/src/lib/+state/postfach.facade.ts
@@ -21,7 +21,6 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { Injectable } from '@angular/core';
 import {
   BinaryFileListResource,
   DownloadBinaryFileAsPdfAction,
@@ -33,6 +32,7 @@ import {
   formatFullDateWithoutSeperator,
 } from '@alfa-client/tech-shared';
 import { VorgangHeaderLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
+import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { TypedAction } from '@ngrx/store/src/models';
 import { getUrl } from '@ngxp/rest';
diff --git a/alfa-client/libs/postfach-shared/src/lib/postfach-shared.module.ts b/alfa-client/libs/postfach-shared/src/lib/postfach-shared.module.ts
index 696d8e73eb29d91eda23cc828b950f0f2a615508..d8f2355dde1b6ab424dbb3c22b412578acb0916d 100644
--- a/alfa-client/libs/postfach-shared/src/lib/postfach-shared.module.ts
+++ b/alfa-client/libs/postfach-shared/src/lib/postfach-shared.module.ts
@@ -21,14 +21,15 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
+import { CommandSharedModule } from '@alfa-client/command-shared';
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { CommandSharedModule } from '@alfa-client/command-shared';
 import { EffectsModule } from '@ngrx/effects';
 import { StoreModule } from '@ngrx/store';
 import { PostfachEffects } from './+state/postfach.effects';
 import { PostfachFacade } from './+state/postfach.facade';
 import * as fromPostfach from './+state/postfach.reducer';
+import { PostfachService } from './postfach.service';
 
 @NgModule({
   imports: [
@@ -37,6 +38,6 @@ import * as fromPostfach from './+state/postfach.reducer';
     StoreModule.forFeature(fromPostfach.POSTFACH_FEATURE_KEY, fromPostfach.postfachReducer),
     EffectsModule.forFeature([PostfachEffects]),
   ],
-  providers: [PostfachFacade],
+  providers: [PostfachFacade, PostfachService],
 })
 export class PostfachSharedModule {}
diff --git a/alfa-client/libs/postfach-shared/src/lib/postfach.service.ts b/alfa-client/libs/postfach-shared/src/lib/postfach.service.ts
index 11fbbb1192c2ce1dc78f5dab641bcd950c83c521..2ac92221cab36de52d7ea812a75a5a965f9346a1 100644
--- a/alfa-client/libs/postfach-shared/src/lib/postfach.service.ts
+++ b/alfa-client/libs/postfach-shared/src/lib/postfach.service.ts
@@ -21,9 +21,6 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { Injectable } from '@angular/core';
-import { MatDialog } from '@angular/material/dialog';
-import { Params } from '@angular/router';
 import {
   BinaryFileListResource,
   BinaryFileResource,
@@ -49,6 +46,9 @@ import {
 } from '@alfa-client/tech-shared';
 import { SnackBarService } from '@alfa-client/ui';
 import { VorgangResource, VorgangService } from '@alfa-client/vorgang-shared';
+import { Injectable } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
+import { Params } from '@angular/router';
 import { Resource, hasLink } from '@ngxp/rest';
 import { isNil, isNull } from 'lodash-es';
 import { BehaviorSubject, Observable, Subscription, combineLatest } from 'rxjs';
@@ -66,7 +66,7 @@ import {
 import { PostfachRepository } from './postfach.repository';
 import { createResendPostfachMailCommand, createSendPostfachMailCommand } from './postfach.util';
 
-@Injectable({ providedIn: 'root' })
+@Injectable()
 export class PostfachService {
   private readonly isPollSendPostachMail: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(
     false,
diff --git a/alfa-client/libs/postfach/src/lib/postfach.module.ts b/alfa-client/libs/postfach/src/lib/postfach.module.ts
index 1b0f9765cb98a7faa8149301820e1841ae20ac4b..9717e23709dbf15d6db239f6695f2c0d372219a1 100644
--- a/alfa-client/libs/postfach/src/lib/postfach.module.ts
+++ b/alfa-client/libs/postfach/src/lib/postfach.module.ts
@@ -21,15 +21,14 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
 import { BinaryFileModule } from '@alfa-client/binary-file';
 import { ON_PAGE, PostfachSharedModule } from '@alfa-client/postfach-shared';
 import { UiModule } from '@alfa-client/ui';
 import { UserProfileModule } from '@alfa-client/user-profile';
-import { VorgangSharedModule } from '@alfa-client/vorgang-shared';
 import { VorgangSharedUiModule } from '@alfa-client/vorgang-shared-ui';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
 import { PostfachMailButtonContainerComponent } from './postfach-mail-button-container/postfach-mail-button-container.component';
 import { PostfachMailButtonComponent } from './postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component';
 import { PostfachMailFormComponent } from './postfach-mail-form/postfach-mail-form.component';
@@ -66,7 +65,6 @@ const routes: Routes = [
     UiModule,
     PostfachSharedModule,
     UserProfileModule,
-    VorgangSharedModule,
     VorgangSharedUiModule,
     BinaryFileModule,
   ],
diff --git a/alfa-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog-data.model.ts b/alfa-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog-data.model.ts
index b755995e474367de8a0577a906ab513f138f19f5..ccf3c423b1017e6826a87fa78689baa6422bc2c4 100644
--- a/alfa-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog-data.model.ts
+++ b/alfa-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog-data.model.ts
@@ -22,10 +22,8 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { ComponentType } from '@angular/cdk/overlay';
-import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
 
 export interface FixedDialogData {
   title: string;
   component: ComponentType<any>;
-  vorgang?: VorgangWithEingangResource;
 }
diff --git a/alfa-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.ts b/alfa-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.ts
index 6d9eec3a38b16fa8e90bd04175723a58d22e1523..0ff50af07391474da47596ab15c768a47986cea4 100644
--- a/alfa-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.ts
+++ b/alfa-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.ts
@@ -21,9 +21,8 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { Component, Inject, Injectable, Injector } from '@angular/core';
+import { Component, Inject, Injector } from '@angular/core';
 import { MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
 import { FixedDialogData } from './fixed-dialog-data.model';
 
 @Component({
@@ -40,12 +39,7 @@ export class FixedDialogComponent {
     injector: Injector,
   ) {
     this.componentInjector = Injector.create({
-      providers: [
-        {
-          provide: InjectedVorgangInDialog,
-          useValue: new InjectedVorgangInDialog(this.data.vorgang),
-        },
-      ],
+      providers: [],
       parent: injector,
     });
   }
@@ -54,8 +48,3 @@ export class FixedDialogComponent {
     this.isMinimized = !this.isMinimized;
   }
 }
-
-@Injectable()
-export class InjectedVorgangInDialog {
-  constructor(public vorgang: VorgangWithEingangResource) {}
-}
diff --git a/alfa-client/libs/vorgang-shared/src/lib/vorgang-shared.module.ts b/alfa-client/libs/vorgang-shared/src/lib/vorgang-shared.module.ts
index bd174181a92a6f388285f69b90633265699066e5..6864db1c3577759b52a27f8df8d12ea58d57c8f5 100644
--- a/alfa-client/libs/vorgang-shared/src/lib/vorgang-shared.module.ts
+++ b/alfa-client/libs/vorgang-shared/src/lib/vorgang-shared.module.ts
@@ -21,14 +21,13 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
 import { BinaryFileSharedModule } from '@alfa-client/binary-file-shared';
 import { CommandSharedModule } from '@alfa-client/command-shared';
 import { NavigationSharedModule } from '@alfa-client/navigation-shared';
-import { PostfachSharedModule } from '@alfa-client/postfach-shared';
 import { TechSharedModule } from '@alfa-client/tech-shared';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
 import { EffectsModule } from '@ngrx/effects';
 import { StoreModule } from '@ngrx/store';
 import { RestModule } from '@ngxp/rest';
@@ -45,7 +44,6 @@ import * as fromVorgang from './+state/vorgang.reducer';
     TechSharedModule,
     CommandSharedModule,
     BinaryFileSharedModule,
-    PostfachSharedModule,
     RouterModule,
     StoreModule.forFeature(fromVorgang.VORGANG_FEATURE_KEY, fromVorgang.reducer),
     EffectsModule.forFeature([VorgangEffects]),