diff --git a/host_vars/backup.oopen.de.yml b/host_vars/backup.oopen.de.yml
index b0b7a4a..2af3e78 100644
--- a/host_vars/backup.oopen.de.yml
+++ b/host_vars/backup.oopen.de.yml
@@ -27,6 +27,11 @@ root_ssh_keypair:
     priv_key_dest: /root/.ssh/id_rsa
     pub_key_src: backup.oopen.de/root/.ssh/id_rsa.pub
     pub_key_dest: /root/.ssh/id_rsa.pub
+  - name: id_ed25519-gitea
+    priv_key_src: backup.oopen.de/root/.ssh/id_ed25519-gitea
+    priv_key_dest: /root/.ssh/id_rsa
+    pub_key_src: backup.oopen.de/root/.ssh/id_ed25519-gitea.pub
+    pub_key_dest: /root/.ssh/id_rsa.pub
 
 
 # ---
diff --git a/host_vars/backup.warenform.de.yml b/host_vars/backup.warenform.de.yml
index 240a032..18b9f85 100644
--- a/host_vars/backup.warenform.de.yml
+++ b/host_vars/backup.warenform.de.yml
@@ -22,12 +22,25 @@ root_ssh_keypair:
     priv_key_dest: /root/.ssh/borg-client_key
     pub_key_src: backup.warenform.de/root/.ssh/borg-client_key.pub
     pub_key_dest: /root/.ssh/borg-client_key.pub
+
   - name: id_ed25519-borg-backup
     priv_key_src: backup.warenform.de/root/.ssh/id_ed25519-borg-backup
     priv_key_dest: /root/.ssh/id_ed25519-borg-backup
     pub_key_src: backup.warenform.de/root/.ssh/id_ed25519-borg-backup.pub
     pub_key_dest: /root/.ssh/id_ed25519-borg-backup.pub
 
+  - name: id_rsa
+    priv_key_src: backup.warenform.de/root/.ssh/id_rsa
+    priv_key_dest: /root/.ssh/id_rsa
+    pub_key_src: backup.warenform.de/root/.ssh/id_rsa.pub
+    pub_key_dest: /root/.ssh/id_rsa.pub
+
+  - name: id_ed25519-gitea
+    priv_key_src: backup.warenform.de/root/.ssh/id_ed25519-gitea
+    priv_key_dest: /root/.ssh/id_rsa
+    pub_key_src: backup.warenform.de/root/.ssh/id_ed25519-gitea.pub
+    pub_key_dest: /root/.ssh/id_rsa.pub
+
 
 # ---
 # vars used by roles/common/tasks/basic.yml
@@ -176,22 +189,8 @@ cron_user_entries:
 # ---
 
 insert_ssh_keypair_backup_server: false
-ssh_keypair_backup_server:
-  - name: backup
-    backup_user: back
-    priv_key_src: root/.ssh/id_rsa.backup.warenform.de
-    priv_key_dest: /root/.ssh/id_rsa
-    pub_key_src: root/.ssh/id_rsa.backup.warenform.de.pub
-    pub_key_dest: /root/.ssh/id_rsa.pub
 
-insert_keypair_backup_client: true
-ssh_keypair_backup_client:
-  - name: backup
-    priv_key_src: root/.ssh/id_ed25519.warenform-server
-    priv_key_dest: /root/.ssh/id_ed25519
-    pub_key_src: root/.ssh/id_ed25519.warenform-server.pub
-    pub_key_dest: /root/.ssh/id_ed25519.pub
-    target: backup.warenform.de
+
 
 
 default_user:
diff --git a/host_vars/o26.oopen.de.yml b/host_vars/o26.oopen.de.yml
index c886a00..a814886 100644
--- a/host_vars/o26.oopen.de.yml
+++ b/host_vars/o26.oopen.de.yml
@@ -253,6 +253,11 @@ root_ssh_keypair:
     priv_key_dest: /root/.ssh/id_ed25519-borg-backup
     pub_key_src: o26.oopen.de/root/.ssh/id_ed25519-borg-backup.pub
     pub_key_dest: /root/.ssh/id_ed25519-borg-backup.pub
+  - name: id_ed25519-gitea
+    priv_key_src: o26.oopen.de/root/.ssh/id_ed25519-gitea
+    priv_key_dest: /root/.ssh/id_rsa
+    pub_key_src: o26.oopen.de/root/.ssh/id_ed25519-gitea.pub
+    pub_key_dest: /root/.ssh/id_rsa.pub
 
 
 # ---
diff --git a/roles/common/files/backup.oopen.de/root/.ssh/id_ed25519-gitea b/roles/common/files/backup.oopen.de/root/.ssh/id_ed25519-gitea
new file mode 100644
index 0000000..3cf25f0
--- /dev/null
+++ b/roles/common/files/backup.oopen.de/root/.ssh/id_ed25519-gitea
@@ -0,0 +1,7 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+QyNTUxOQAAACBU37L4v/+x8EYXdiUkOQkPGyAn6chLuAOngZrLfWFQuAAAAJDKBGM4ygRj
+OAAAAAtzc2gtZWQyNTUxOQAAACBU37L4v/+x8EYXdiUkOQkPGyAn6chLuAOngZrLfWFQuA
+AAAECu7UCHp5+im+P8jO8/179MkQ79d7Vpq+iO7LXMueQ8hlTfsvi//7HwRhd2JSQ5CQ8b
+ICfpyEu4A6eBmst9YVC4AAAAC3Jvb3RAYmFja3VwAQI=
+-----END OPENSSH PRIVATE KEY-----
diff --git a/roles/common/files/backup.oopen.de/root/.ssh/id_ed25519-gitea.pub b/roles/common/files/backup.oopen.de/root/.ssh/id_ed25519-gitea.pub
new file mode 100644
index 0000000..7c3c8f2
--- /dev/null
+++ b/roles/common/files/backup.oopen.de/root/.ssh/id_ed25519-gitea.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFTfsvi//7HwRhd2JSQ5CQ8bICfpyEu4A6eBmst9YVC4 root@backup-git.oopen.de
diff --git a/roles/common/files/backup.warenform.de/root/.ssh/id_ed25519-gitea b/roles/common/files/backup.warenform.de/root/.ssh/id_ed25519-gitea
new file mode 100644
index 0000000..bfea699
--- /dev/null
+++ b/roles/common/files/backup.warenform.de/root/.ssh/id_ed25519-gitea
@@ -0,0 +1,7 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+QyNTUxOQAAACDzzHxBc/r9LMGw0ErlaiZjLzUtVmzFHzzQ5c44Kq8yaQAAAJBAfIj6QHyI
++gAAAAtzc2gtZWQyNTUxOQAAACDzzHxBc/r9LMGw0ErlaiZjLzUtVmzFHzzQ5c44Kq8yaQ
+AAAEAVX5TvkiBcmG95JktaEeix0i11EMK9eX16Z8PSv27+NfPMfEFz+v0swbDQSuVqJmMv
+NS1WbMUfPNDlzjgqrzJpAAAAC3Jvb3RAYmFja3VwAQI=
+-----END OPENSSH PRIVATE KEY-----
diff --git a/roles/common/files/backup.warenform.de/root/.ssh/id_ed25519-gitea.pub b/roles/common/files/backup.warenform.de/root/.ssh/id_ed25519-gitea.pub
new file mode 100644
index 0000000..cf27204
--- /dev/null
+++ b/roles/common/files/backup.warenform.de/root/.ssh/id_ed25519-gitea.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPPMfEFz+v0swbDQSuVqJmMvNS1WbMUfPNDlzjgqrzJp root@backup
diff --git a/roles/common/files/backup.warenform.de/root/.ssh/id_rsa b/roles/common/files/backup.warenform.de/root/.ssh/id_rsa
new file mode 100644
index 0000000..6163de0
--- /dev/null
+++ b/roles/common/files/backup.warenform.de/root/.ssh/id_rsa
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAmQffh8lmO69ukeW0hC7wQ8EEqEsKPja5IvYr1fVqmR5gUJDR
+FQ015sxpIIuLgo4kCbe6pz7aV6rLUAxysMV06PbBRJPzq0SvaXek3Begygt11U0+
+HFQN7pVw+agxvbdE0YwxhOfJWl8f/wkti+p/G7+G7O0bMyFdzH2eeYXmzh3Nf4No
+ST8moQ2PVpDaJ73u/s7Z2oPng2LhVneGqyRdV40exiFOBS5pGJZ/10GZthkrhUAE
+GzPTusenN4+Vw2oriKP3+eyLzsB8qSPX5u7oR4Su9QY2VxTwkuXZDrxTBZwpIB/m
+XobMRZeRQxDGeSsU1mCf9cquanFLIx4a1ySUDwIBIwKCAQBKVEgAH/50wuyQAdtW
+JW1ivNZgXvZYu35+shVKqmb56i7IC9NEvUYRBDMPzsAa11NVLVqpAUV7CdB3VoDZ
+hHqdCiNb0tVwcdGK/5k3s7R/ZKbykzts2F6J046lJc8EYFSgS2iCYfQV87B0j23k
+35zS9qCe9tKyb0rRCdChbOxyvURy+T8fr1GoqPWU7lmIq10Fq2DHn0uGl45dayZ8
+tyjZDZF/IRKjnqUoLR9ly0jvW4rHx1I8seYLWPFiy5G4SVAD21R/1E2zelsJPt4H
+s8OJirHj/qfTBiF/prTnbofqkZ5VCX4QZCK7R3F3kXggJaaYC7R3aAedlteq3nCp
+oW/TAoGBAMdQypxdtejgtBuW6KZYSep5zKULJSFBwO6B1GuM0wo6YMVq7V0i9J7y
+pOu+W2qNrPY7vpVNhzPKEJ72Dpkt6RhoIwK8SJJ8s6cUCw7jimEW2GyDOhsTbv+W
+cBmHe6CydHp3lFb8ZTBgfYMeyEvopa+0F/QhYeS69Txr/0QVvMBdAoGBAMSNTjrm
+ibO/dhC6NfPyT3IuCsfpFtBoxEYybCY7qw4TAVr7HQa+icFp0OoLFnrhRlPMUHoy
+mLdCw63fg4VHRH1y6pKQ0MLCa0dU4qWKH5pCrNQy/A0JqGC5adKbt3xhKQ5T0l6p
+y+r6HY3x4L97gyxDmfwLv8kQrulIRdCvdc9bAoGBAJnB+2KusObZOnuu7fyqgino
+7lNu/2LMUwEiU2jo+pLck8t+X1Z6DSoo5Z/qnkriUjpLWIHOF9d+nxuKnYwcGjdm
+RuTaY963+E2wYE1QchBiFKt7LNMO/dscR9kuAEjELfgTGqmA4FiE8xwBzbbmq7Nt
+rBQZwIvgro2yZdVv2sBHAoGBAIbHS5YabQ2KmhoZSZFVstHzr58GO4eYTBLgvzAo
+6lLLNCEhOHmnOeO2RhzUZy+war0eYxH2zx6ULmiZRD4iPZfZxWvRBC3HJP22jMlI
+xTaUHr1kyheRmAfPmQVyF2s7T1pIGzmZANukMYXnsA5GEM3lNmOwSP7m3lbSeQQg
+i0xbAoGBAJKaYlEVJuOF5utmTUBaiI0Y5R9udLqQ4wYv1YiYWWLX5SGVoyGAQJpc
+OlV3kq1WsBIxvkPnA19G++5o672vN64mUlxsnXwT5LRUsy+VuMLY/q1TqT66TXI0
+OuCEtZWL3yA2Sr22VLsL/rYsbNW6vdAaRkzxbzk8rImEnk2C4IWv
+-----END RSA PRIVATE KEY-----
diff --git a/roles/common/files/backup.warenform.de/root/.ssh/id_rsa.pub b/roles/common/files/backup.warenform.de/root/.ssh/id_rsa.pub
new file mode 100644
index 0000000..f87a382
--- /dev/null
+++ b/roles/common/files/backup.warenform.de/root/.ssh/id_rsa.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAmQffh8lmO69ukeW0hC7wQ8EEqEsKPja5IvYr1fVqmR5gUJDRFQ015sxpIIuLgo4kCbe6pz7aV6rLUAxysMV06PbBRJPzq0SvaXek3Begygt11U0+HFQN7pVw+agxvbdE0YwxhOfJWl8f/wkti+p/G7+G7O0bMyFdzH2eeYXmzh3Nf4NoST8moQ2PVpDaJ73u/s7Z2oPng2LhVneGqyRdV40exiFOBS5pGJZ/10GZthkrhUAEGzPTusenN4+Vw2oriKP3+eyLzsB8qSPX5u7oR4Su9QY2VxTwkuXZDrxTBZwpIB/mXobMRZeRQxDGeSsU1mCf9cquanFLIx4a1ySUDw== root@backup.warenform.de
diff --git a/roles/common/files/o26.oopen.de/root/.ssh/id_ed25519-gitea b/roles/common/files/o26.oopen.de/root/.ssh/id_ed25519-gitea
new file mode 100644
index 0000000..8ae4042
--- /dev/null
+++ b/roles/common/files/o26.oopen.de/root/.ssh/id_ed25519-gitea
@@ -0,0 +1,7 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+QyNTUxOQAAACDV7Znk+sPYQ9Hj2DYmGZOs8AMDEG47Evtt7EYn/xyLYAAAAJAAtWmGALVp
+hgAAAAtzc2gtZWQyNTUxOQAAACDV7Znk+sPYQ9Hj2DYmGZOs8AMDEG47Evtt7EYn/xyLYA
+AAAECtPg+FDGfh+K2XlUoNktXgc4GVjewaVDmgGlkG6GopHtXtmeT6w9hD0ePYNiYZk6zw
+AwMQbjsS+23sRif/HItgAAAACHJvb3RAbzI2AQIDBAU=
+-----END OPENSSH PRIVATE KEY-----
diff --git a/roles/common/files/o26.oopen.de/root/.ssh/id_ed25519-gitea.pub b/roles/common/files/o26.oopen.de/root/.ssh/id_ed25519-gitea.pub
new file mode 100644
index 0000000..453d0b0
--- /dev/null
+++ b/roles/common/files/o26.oopen.de/root/.ssh/id_ed25519-gitea.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINXtmeT6w9hD0ePYNiYZk6zwAwMQbjsS+23sRif/HItg root@o26