diff --git a/.mergify.yml b/.mergify.yml
index f2e5b860..c1141a93 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -35,18 +35,18 @@ pull_request_rules:
       comment:
         message: bors r+
 
-  - name: Backport to 1.7 branch
+  - name: Backport to 1.8  branch
     conditions:
       - base=master
       - label=type/backport
     actions:
       backport:
         branches:
-          - '1.7'
+          - '1.8'
 
   - name: remove outdated reviews
     conditions:
-      - base~=^(master|1.7)$
+      - base~=^(master|1.8)$
     actions:
       dismiss_reviews:
         approved: True
diff --git a/docs/conf.py b/docs/conf.py
index 24648e88..6b19f967 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -36,7 +36,7 @@ html_context = {
     'github_user': 'mailu',
     'github_repo': 'mailu',
     'github_version': version,
-    'stable_version': '1.8',
+    'stable_version': '1.7',
     'versions': [
         ('1.5', '/1.5/'),
         ('1.6', '/1.6/'),
diff --git a/setup/flavors/stack/docker-compose.yml b/setup/flavors/stack/docker-compose.yml
index 3568cfdc..d9c5cd4f 100644
--- a/setup/flavors/stack/docker-compose.yml
+++ b/setup/flavors/stack/docker-compose.yml
@@ -29,7 +29,7 @@ services:
       - "{{ root }}/certs:/certs"
       - "{{ root }}/overrides/nginx:/overrides:ro"
     deploy:
-      replicas: {{ front_replicas }}
+      replicas: 1
 
   admin:
     image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-{{ version }}}
@@ -42,7 +42,7 @@ services:
       - "{{ root }}/data:/data"
       - "{{ root }}/dkim:/dkim"
     deploy:
-      replicas: {{ admin_replicas }}
+      replicas: 1
     healthcheck:
       disable: true
 
@@ -53,7 +53,7 @@ services:
       - "{{ root }}/mail:/mail"
       - "{{ root }}/overrides/dovecot:/overrides:ro"
     deploy:
-      replicas: {{ imap_replicas }}
+      replicas: 1
     healthcheck:
       disable: true
 
@@ -64,7 +64,7 @@ services:
       - "{{ root }}/mailqueue:/queue"
       - "{{ root }}/overrides/postfix:/overrides:ro"
     deploy:
-      replicas: {{ smtp_replicas }}
+      replicas: 1
     healthcheck:
       disable: true
 
diff --git a/setup/templates/steps/config.html b/setup/templates/steps/config.html
index d6526eeb..29d8dddd 100644
--- a/setup/templates/steps/config.html
+++ b/setup/templates/steps/config.html
@@ -1,9 +1,11 @@
 {% if flavor == "stack" %}
 {% call macros.panel("danger", "Docker stack / swarm is experimental") %}
 Setup is capable of generating a somewhat decent docker-compose.yml,
-for the docker stack flavor. However its usage is for advanced users an is experimental.
-Expect many challenges is shared mail storage and fail-over scenarios! Some user experiences
+for the docker stack flavor. However its usage is for advanced users only and is experimental.
+Expect many challenges such as shared mail storage and fail-over scenarios! Some user experiences
 have been <a href="https://github.com/Mailu/Mailu/blob/master/docs/swarm/master/README.md">shared on GitHub.</a>
+For this reason also think very hard about using a replica count higher than 1. This cannot be used with the default config.
+Manual post-configuration is required for using a replica count higher than 1.
 {% endcall %}
 {% endif %}
 
diff --git a/setup/templates/steps/database.html b/setup/templates/steps/database.html
index af5334cc..194de577 100644
--- a/setup/templates/steps/database.html
+++ b/setup/templates/steps/database.html
@@ -11,13 +11,16 @@
 	<p></p>
 	<div id="postgres_db" style="display: none">
 		<div class="form-check">
-			<input class="form-check-input" type="radio" name="postgresql" id="internal_psql" value="internal" checked>
+			<input class="form-check-input" type="radio" name="postgresql" id="internal_psql" value="internal">
 			<label class="form-check-label" for="internal_psql">
-				Use the Postgresql from Mailu
+				Use the PostgreSQL image from Mailu. Warning, this image is deprecated.
+                                It will be removed from Mailu 1.9. Existing users can still upgrade to Mailu 1.8 using this image.
+                                With the release of Mailu 1.9,
+                                we will offer a mechanism for migrating your data to another database management system.
 			</label>
 		</div>
 		<div class="form-check">
-			<input class="form-check-input" type="radio" name="postgresql" value="external" id="external_psql" >
+			<input class="form-check-input" type="radio" name="postgresql" value="external" id="external_psql" checked>
 			<label class="form-check-label" for="external_psql">
 				I want to connect to an external database
 			</label>
@@ -37,4 +40,4 @@
 	</div>
 </div>
 
-{% endcall %}
\ No newline at end of file
+{% endcall %}
diff --git a/setup/templates/steps/stack/04_replicas.html b/setup/templates/steps/stack/04_replicas.html
deleted file mode 100644
index 9f6de061..00000000
--- a/setup/templates/steps/stack/04_replicas.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% call macros.panel("info", "Step 5 - Number of replicas for containers") %}
-<p>Select number of replicas for containers</p>
-
-<div class="form-group">
-  <input class="form-control" type="number" name="front_replicas" min="1" required value="1"
-  		style="width: 6%; display: inline;">
-  <label>Front</label>
-</div>
-
-<div class="form-group">
-  <input class="form-control" type="number" name="admin_replicas" min="1" required value="1"
-  		style="width: 6%; display: inline;">
-  <label>Admin</label>
-</div>
-
-<div class="form-group">
-  <input class="form-control" type="number" name="imap_replicas" min="1" required value="1"
-  		style="width: 6%; display: inline;">
-  <label>IMAP</label>
-</div>
-
-<div class="form-group">
-  <input class="form-control" type="number" name=smtp_replicas min="1" required value="1"
-  		style="width: 6%; display: inline;">
-  <label>SMTP</label>
-</div>
-
-{% endcall %}