diff --git a/group_vars/all/plain.yml b/group_vars/all/plain.yml
index 9f72f9f..c1c6d23 100644
--- a/group_vars/all/plain.yml
+++ b/group_vars/all/plain.yml
@@ -72,7 +72,6 @@ backupuser_user_name: backupuser
 # (@see cloud console / security / ssh-keys) (web ui)
 default_hetzner_ssh_keys:
   - "claus.paetow@netgo.de"
-  - "friedrich.goerz@netgo.de"
   - "sven.ketelsen@netgo.de"
   - "michael.haehnel@netgo.de"
   - "hoan.to@netgo.de"
@@ -113,7 +112,6 @@ default_users:
 
 default_plattform_users:
   - "claus.paetow"
-  - "friedrich.goerz"
   - "sven.ketelsen"
   - "michael.haehnel"
   - "hoan.to"
diff --git a/group_vars/stage_prodwork01/plain.yml b/group_vars/stage_prodwork01/plain.yml
index b520e43..9578440 100644
--- a/group_vars/stage_prodwork01/plain.yml
+++ b/group_vars/stage_prodwork01/plain.yml
@@ -1,15 +1,6 @@
 ---
 stage: "prodwork01"
 
-default_plattform_users:
-  - "friedrich.goerz"
-  - "sven.ketelsen"
-  - "michael.haehnel"
-  - "hoan.to"
-  - "hendrik.kiedrowski"
-  - "{{ awx_ansible_user_name }}"
-  - "{{ gitlab_ansible_user_name }}"
-
 # TODO read configuration with hetzner rest api
 shared_service_network: "10.3.0.0/16"
 
diff --git a/host_vars/dev-postgres02-01.yml b/host_vars/dev-postgres02-01.yml
new file mode 100644
index 0000000..fbbefea
--- /dev/null
+++ b/host_vars/dev-postgres02-01.yml
@@ -0,0 +1,2 @@
+---
+server_type: "master"
diff --git a/host_vars/dev-postgres02-02.yml b/host_vars/dev-postgres02-02.yml
new file mode 100644
index 0000000..962f9a5
--- /dev/null
+++ b/host_vars/dev-postgres02-02.yml
@@ -0,0 +1,2 @@
+---
+server_type: "slave"
diff --git a/host_vars/prodnso-postgres02-01.yml b/host_vars/prodnso-postgres02-01.yml
index a47a98a..fbbefea 100644
--- a/host_vars/prodnso-postgres02-01.yml
+++ b/host_vars/prodnso-postgres02-01.yml
@@ -1,3 +1,2 @@
 ---
 server_type: "master"
-lvm_volume_encryption: true
diff --git a/host_vars/prodnso-postgres02-02.yml b/host_vars/prodnso-postgres02-02.yml
index 4d95a12..962f9a5 100644
--- a/host_vars/prodnso-postgres02-02.yml
+++ b/host_vars/prodnso-postgres02-02.yml
@@ -1,3 +1,2 @@
 ---
 server_type: "slave"
-lvm_volume_encryption: true
diff --git a/host_vars/qa-postgres02-01.yml b/host_vars/qa-postgres02-01.yml
new file mode 100644
index 0000000..fbbefea
--- /dev/null
+++ b/host_vars/qa-postgres02-01.yml
@@ -0,0 +1,2 @@
+---
+server_type: "master"
diff --git a/host_vars/qa-postgres02-02.yml b/host_vars/qa-postgres02-02.yml
new file mode 100644
index 0000000..962f9a5
--- /dev/null
+++ b/host_vars/qa-postgres02-02.yml
@@ -0,0 +1,2 @@
+---
+server_type: "slave"
diff --git a/stage-dev b/stage-dev
index 90ca487..b185352 100644
--- a/stage-dev
+++ b/stage-dev
@@ -47,8 +47,13 @@ dev-mail-01
 dev-postgres-01
 dev-postgres-02
 
+[postgres02]
+dev-postgres02-01
+dev-postgres02-02
+
 [postgres:children]
 postgres01
+postgres02
 
 [prometheus]
 dev-prometheus-01
diff --git a/stage-qa b/stage-qa
index 1b614cb..7022dd8 100644
--- a/stage-qa
+++ b/stage-qa
@@ -42,10 +42,18 @@ qa-mail-01
 [pgadmin4]
 qa-pgadmin4-01
 
-[postgres]
+[postgres01]
 qa-postgres-01
 qa-postgres-02
 
+[postgres02]
+qa-postgres02-01
+qa-postgres02-02
+
+[postgres:children]
+postgres01
+postgres02
+
 [prometheus]
 qa-prometheus-01
 
diff --git a/users/friedrich.goerz/ssh.pub b/users/outdated/friedrich.goerz.2023.06.15.pub
similarity index 100%
rename from users/friedrich.goerz/ssh.pub
rename to users/outdated/friedrich.goerz.2023.06.15.pub