diff --git a/changelog.d/2-features/backoffice b/changelog.d/2-features/backoffice
new file mode 100644
index 0000000000..f4ff9f2f46
--- /dev/null
+++ b/changelog.d/2-features/backoffice
@@ -0,0 +1 @@
+charts/wire-server: Optionally include backoffice
\ No newline at end of file
diff --git a/changelog.d/3-bug-fixes/backoffice b/changelog.d/3-bug-fixes/backoffice
new file mode 100644
index 0000000000..cc6de0f7e8
--- /dev/null
+++ b/changelog.d/3-bug-fixes/backoffice
@@ -0,0 +1 @@
+charts/backoffice: Fix version of frontend and auto-bump version of stern on every release
\ No newline at end of file
diff --git a/charts/backoffice/values.yaml b/charts/backoffice/values.yaml
index 55be81f6cc..a96c84e5ad 100644
--- a/charts/backoffice/values.yaml
+++ b/charts/backoffice/values.yaml
@@ -2,11 +2,11 @@ replicaCount: 1
 images:
   frontend:
     repository: quay.io/wire/backoffice-frontend
-    tag: 2.93.0
+    tag: 2.87.0
     pullPolicy: IfNotPresent
   stern:
     repository: quay.io/wire/stern
-    tag: 2.93.0
+    tag: do-not-use
     pullPolicy: IfNotPresent
 service:
   internalPort: 8080
diff --git a/charts/wire-server/requirements.yaml b/charts/wire-server/requirements.yaml
index ab3d8c1df8..88629b3acf 100644
--- a/charts/wire-server/requirements.yaml
+++ b/charts/wire-server/requirements.yaml
@@ -15,6 +15,13 @@ dependencies:
 ########################
 ## wire-servers/services
 ########################
+- name: backoffice
+  version: "0.0.42"
+  repository: "file://../backoffice"
+  tags:
+    - backoffice
+    - haskellServices
+    - services
 - name: cannon
   version: "0.0.42"
   repository: "file://../cannon"
diff --git a/charts/wire-server/values.yaml b/charts/wire-server/values.yaml
index de41554b58..cae8e07623 100644
--- a/charts/wire-server/values.yaml
+++ b/charts/wire-server/values.yaml
@@ -11,3 +11,4 @@ tags:
   legalhold: false
   federator: false # see also galley.config.enableFederator and brig.config.enableFederator
   sftd: false
+  backoffice: false
diff --git a/hack/bin/set-chart-image-version.sh b/hack/bin/set-chart-image-version.sh
index d133007e4a..64c2cf0293 100755
--- a/hack/bin/set-chart-image-version.sh
+++ b/hack/bin/set-chart-image-version.sh
@@ -12,6 +12,9 @@ do
 if [[ "$chart" == "nginz" ]]; then
     # nginz has a different docker tag indentation
     sed -i "s/^    tag: .*/    tag: $docker_tag/g" "$CHARTS_DIR/$chart/values.yaml"
+elif [[ "$chart" == "backoffice" ]]; then
+    # There are two images at the same level and we want update only stern.
+    sed -i "s/tag: do-not-use/tag: $docker_tag/g" "$CHARTS_DIR/$chart/values.yaml"
 else
     sed -i "s/^  tag: .*/  tag: $docker_tag/g" "$CHARTS_DIR/$chart/values.yaml"
 fi
diff --git a/hack/bin/set-wire-server-image-version.sh b/hack/bin/set-wire-server-image-version.sh
index d3438814e9..f439d42514 100755
--- a/hack/bin/set-wire-server-image-version.sh
+++ b/hack/bin/set-wire-server-image-version.sh
@@ -12,5 +12,9 @@ for chart in "${charts[@]}"; do
     sed -i "s/^  tag: .*/  tag: $target_version/g" "$CHARTS_DIR/$chart/values.yaml"
 done
 
-#special case nginz
+# special case nginz
 sed -i "s/^    tag: .*/    tag: $target_version/g" "$CHARTS_DIR/nginz/values.yaml"
+
+# special case backoffice as there are two images at the same level and we want
+# update only one.
+sed -i "s/tag: do-not-use/tag: $target_version/g" "$CHARTS_DIR/backoffice/values.yaml"