diff --git a/playbooks/host_hatoria.banananet.work.yml b/playbooks/host_hatoria.banananet.work.yml
index 44fff6e..90926eb 100644
--- a/playbooks/host_hatoria.banananet.work.yml
+++ b/playbooks/host_hatoria.banananet.work.yml
@@ -129,6 +129,83 @@
         - forumderschan.de
       domain: www.forumderschan.de
       dest: forumderschan.de
+    # WG Nextcloud
+    - role: server/nextcloud
+      tags:
+        - wg.banananet.work
+      domain: wg.banananet.work
+      nextcloud_admin_user: felix
+      enabled_apps_list:
+        - accessibility
+        - activity
+        - apporder
+        - bruteforcesettings
+        - calendar
+        - checksum
+        - cloud_federation_api
+        - comments
+        - contacts
+        - cookbook
+        - cospend
+        - dav
+        - deck
+        - encryption
+        - external
+        - federatedfilesharing
+        - federation
+        - files
+        - files_automatedtagging
+        - files_external
+        - files_pdfviewer
+        - files_rightclick
+        - files_sharing
+        - files_trashbin
+        - files_versions
+        - files_videoplayer
+        - firstrunwizard
+        - logreader
+        - lookup_server_connector
+        - metadata
+        - nextcloud_announcements
+        - notes
+        - notifications
+        - oauth2
+        - ocdownloader
+        - password_policy
+        - photos
+        - polls
+        - privacy
+        - provisioning_api
+        - quota_warning
+        - ransomware_detection
+        - ransomware_protection
+        - serverinfo
+        - settings
+        - sharebymail
+        - side_menu
+        - sociallogin
+        - socialsharing_email
+        - support
+        - suspicious_login
+        - systemtags
+        - tasks
+        - text
+        - theming
+        - twofactor_admin
+        - twofactor_backupcodes
+        - twofactor_gateway
+        - twofactor_nextcloud_notification
+        - twofactor_totp
+        - twofactor_u2f
+        - updatenotification
+        - viewer
+        - workflowengine
+      disabled_apps_list:
+        - admin_audit
+        - recommendations
+        - spreed
+        - survey_client
+        - user_ldap
     # WG Minecraft
     - role: server/minecraft
       tags:
@@ -141,6 +218,93 @@
         difficulty: normal
         motd: ChaosCraft
         view-distance: 16
+    # SMD/SFC HST 2020
+    - role: nginx/forward
+      tags:
+        - proj-hst
+        - hst21.banananet.work
+      domain: hst20.banananet.work
+      dest: hst21.banananet.work
+    - role: server/nextcloud
+      tags:
+        - proj-hst
+        - hst21.banananet.work
+      domain: hst21.banananet.work
+      system_user: nc-hst21
+      nextcloud_admin_user: felix
+      enabled_apps_list:
+        - accessibility
+        - activity
+        - apporder
+        - bruteforcesettings
+        - calendar
+        #- checksum # currently not supported
+        - cloud_federation_api
+        - comments
+        - contacts
+        - cospend
+        - dav
+        - deck
+        - encryption
+        - external
+        - federatedfilesharing
+        - federation
+        - files
+        - files_automatedtagging
+        - files_mindmap
+        - files_pdfviewer
+        - files_rightclick
+        - files_sharing
+        - files_trashbin
+        - files_versions
+        - files_videoplayer
+        - firstrunwizard
+        - forms
+        - logreader
+        - lookup_server_connector
+        - metadata
+        - nextcloud_announcements
+        - notes
+        - notifications
+        - oauth2
+        - password_policy
+        - photos
+        - polls
+        - privacy
+        - provisioning_api
+        - quota_warning
+        #- ransomware_detection # currently not supported
+        - ransomware_protection
+        - serverinfo
+        - settings
+        - sharebymail
+        - socialsharing_email
+        - spreed
+        - support
+        - suspicious_login
+        - systemtags
+        - tasks
+        - text
+        - theming
+        - twofactor_admin
+        - twofactor_backupcodes
+        - twofactor_gateway
+        - twofactor_totp
+        - twofactor_u2f
+        - updatenotification
+        - viewer
+        - whiteboard
+        - workflowengine
+      disabled_apps_list:
+        - admin_audit
+        - dashboard
+        - files_external
+        - recommendations
+        - sociallogin
+        - survey_client
+        - user_ldap
+        - user_status
+        - weather_status
   tasks:
     - name: Configure custom archive Nextcloud directory on hdd for personal usages
       tags:
diff --git a/playbooks/host_nvak.banananet.work.yml b/playbooks/host_nvak.banananet.work.yml
index eacc301..2b620bc 100644
--- a/playbooks/host_nvak.banananet.work.yml
+++ b/playbooks/host_nvak.banananet.work.yml
@@ -56,167 +56,9 @@
       root: html
       installation_includes:
         - includes
-    # WG Nextcloud
-    - role: server/nextcloud
-      tags:
-        - wg.banananet.work
-      domain: wg.banananet.work
-      system_user: wg-banananet-work
-      nextcloud_admin_user: felix
-      enabled_apps_list:
-        - accessibility
-        - activity
-        - apporder
-        - bruteforcesettings
-        - calendar
-        - checksum
-        - cloud_federation_api
-        - comments
-        - contacts
-        - cookbook
-        - cospend
-        - dav
-        - deck
-        - encryption
-        - external
-        - federatedfilesharing
-        - federation
-        - files
-        - files_automatedtagging
-        - files_external
-        - files_pdfviewer
-        - files_rightclick
-        - files_sharing
-        - files_trashbin
-        - files_versions
-        - files_videoplayer
-        - firstrunwizard
-        - logreader
-        - lookup_server_connector
-        - metadata
-        - nextcloud_announcements
-        - notes
-        - notifications
-        - oauth2
-        - ocdownloader
-        - password_policy
-        - photos
-        - polls
-        - privacy
-        - provisioning_api
-        - quota_warning
-        - ransomware_detection
-        - ransomware_protection
-        - serverinfo
-        - settings
-        - sharebymail
-        - side_menu
-        - sociallogin
-        - socialsharing_email
-        - support
-        - suspicious_login
-        - systemtags
-        - tasks
-        - text
-        - theming
-        - twofactor_admin
-        - twofactor_backupcodes
-        - twofactor_gateway
-        - twofactor_nextcloud_notification
-        - twofactor_totp
-        - twofactor_u2f
-        - updatenotification
-        - viewer
-        - workflowengine
-      disabled_apps_list:
-        - admin_audit
-        - recommendations
-        - spreed
-        - survey_client
-        - user_ldap
     - role: server/static
       domain: turnips.banananet.work
       repo: https://git.banananet.work/banananetwork/ac-nh-turnip-prices.git
-    # SMD/SFC HST 2020
-    - role: server/nextcloud
-      tags:
-        - hst20.banananet.work
-      domain: hst20.banananet.work
-      system_user: nc-hst20
-      nextcloud_admin_user: felix
-      enabled_apps_list:
-        - accessibility
-        - activity
-        - apporder
-        - bruteforcesettings
-        - calendar
-        #- checksum # currently not supported
-        - cloud_federation_api
-        - comments
-        - contacts
-        - cospend
-        - dav
-        - deck
-        - encryption
-        - external
-        - federatedfilesharing
-        - federation
-        - files
-        - files_automatedtagging
-        - files_mindmap
-        - files_pdfviewer
-        - files_rightclick
-        - files_sharing
-        - files_trashbin
-        - files_versions
-        - files_videoplayer
-        - firstrunwizard
-        - forms
-        - logreader
-        - lookup_server_connector
-        - metadata
-        - nextcloud_announcements
-        - notes
-        - notifications
-        - oauth2
-        - password_policy
-        - photos
-        - polls
-        - privacy
-        - provisioning_api
-        - quota_warning
-        #- ransomware_detection # currently not supported
-        - ransomware_protection
-        - serverinfo
-        - settings
-        - sharebymail
-        - socialsharing_email
-        - spreed
-        - support
-        - suspicious_login
-        - systemtags
-        - tasks
-        - text
-        - theming
-        - twofactor_admin
-        - twofactor_backupcodes
-        - twofactor_gateway
-        - twofactor_totp
-        - twofactor_u2f
-        - updatenotification
-        - viewer
-        - whiteboard
-        - workflowengine
-      disabled_apps_list:
-        - admin_audit
-        - dashboard
-        - files_external
-        - recommendations
-        - sociallogin
-        - survey_client
-        - user_ldap
-        - user_status
-        - weather_status
 #    # Stadtpiraten
 #    - role: server/typo3
 #      domain: piraten.dev.banananet.work