diff --git a/clients/drone-1.json b/clients/drone-1.json
new file mode 100644
index 0000000..f2fc607
--- /dev/null
+++ b/clients/drone-1.json
@@ -0,0 +1,4 @@
+{
+  "name": "drone-1",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0DLEt7jfKPH7X7pBknG3\nWoB6Q6Vffl6Q0GRxQiMJ1uRC79dulKH097CYfLzIXFZD9gRRP4K78vW5BA2spXVV\nn3qrak9JT6BGgdFrkBEdMNGZyz814aMiyhPZrQUrmIzyH8R04xZgv7UH86qdNQ5p\nPeIXS7gU7/0PmwRgEBiM1KLq+Kba6pYdGefKqxx5D59xweH+yE+rbd5ac9xn2GP7\nyOiZoG2sMuksq7d3O4SeTS2lBAmG5IeiP2iWvHWpZD48PTr78ItkTgIbaqZU2PXV\ng+2OcJPTel5xISooe5FvW8gdpC9SYoBPvgJuJ6czc1+LdUSK7pE7577eAJNDlh+H\nRwIDAQAB\n-----END PUBLIC KEY-----\n"
+}
\ No newline at end of file
diff --git a/clients/gitea-1.json b/clients/gitea-1.json
new file mode 100644
index 0000000..c210a98
--- /dev/null
+++ b/clients/gitea-1.json
@@ -0,0 +1,4 @@
+{
+  "name": "gitea-1",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0bp4I/f5dLL22GRHanLV\nw57sNBEWT3Vx32B24hScKNP5nYDW0dIRkt1c7SLEpe+diNgyIwk7JlI20Vl+oaVo\njdCpmHSB18yXxQT2Ub6aI8ApwFLECVA6SckekcwxLJc/oGRMB52PonI8opJOVbPa\nF+heZ5NNDiMvn3E8qODdMWSjDiJNSVLJgsCPFHAt32aJgLaXQTqG5lrmltaamscW\njGlFqiBJw/5saCkKBPdPwdX4RcDqvGX1FdE1LVB42cskv8CrnvEVFLBxKXAhAr6s\nNhOhenzLGHpy58tNoUoUw3v4WiPRtcnlNxeSVG5LKkjaK04f2oxeZx3SiSU/1naY\nkwIDAQAB\n-----END PUBLIC KEY-----\n"
+}
\ No newline at end of file
diff --git a/nodes/centaurus.kosmos.org.json b/nodes/centaurus.kosmos.org.json
index c617ef4..fcc9c55 100644
--- a/nodes/centaurus.kosmos.org.json
+++ b/nodes/centaurus.kosmos.org.json
@@ -14,7 +14,6 @@
     "roles": [
       "gitea",
       "postgresql_client",
-      "discourse",
       "drone"
     ],
     "recipes": [
@@ -26,8 +25,6 @@
       "kosmos_gitea",
       "kosmos_gitea::default",
       "kosmos_gitea::backup",
-      "kosmos_discourse",
-      "kosmos_discourse::default",
       "kosmos_drone",
       "kosmos_drone::default",
       "kosmos_assets::nginx_site",
@@ -36,7 +33,6 @@
       "kosmos_website",
       "kosmos_website::default",
       "kosmos_zerotier::firewall",
-      "sockethub::_firewall",
       "apt::default",
       "timezone_iii::default",
       "timezone_iii::debian",
@@ -82,13 +78,10 @@
   "run_list": [
     "recipe[kosmos-base]",
     "recipe[kosmos_encfs]",
-    "role[gitea]",
-    "role[drone]",
     "recipe[kosmos_assets::nginx_site]",
     "recipe[kosmos_kvm::host]",
     "recipe[kosmos-ejabberd::firewall]",
     "recipe[kosmos_website::default]",
-    "recipe[kosmos_zerotier::firewall]",
-    "recipe[sockethub::_firewall]"
+    "recipe[kosmos_zerotier::firewall]"
   ]
 }
diff --git a/nodes/drone-1.json b/nodes/drone-1.json
new file mode 100644
index 0000000..5ad5474
--- /dev/null
+++ b/nodes/drone-1.json
@@ -0,0 +1,58 @@
+{
+  "name": "drone-1",
+  "normal": {
+    "knife_zero": {
+      "host": "10.1.1.128"
+    }
+  },
+  "automatic": {
+    "fqdn": "drone-1",
+    "os": "linux",
+    "os_version": "5.4.0-1058-kvm",
+    "hostname": "drone-1",
+    "ipaddress": "192.168.122.200",
+    "roles": [
+      "drone",
+      "postgresql_client"
+    ],
+    "recipes": [
+      "kosmos-base",
+      "kosmos-base::default",
+      "kosmos_postgresql::hostsfile",
+      "kosmos_drone",
+      "kosmos_drone::default",
+      "apt::default",
+      "timezone_iii::default",
+      "timezone_iii::debian",
+      "ntp::default",
+      "ntp::apparmor",
+      "kosmos-base::systemd_emails",
+      "apt::unattended-upgrades",
+      "kosmos-base::firewall",
+      "kosmos-postfix::default",
+      "postfix::default",
+      "postfix::_common",
+      "postfix::_attributes",
+      "postfix::sasl_auth",
+      "hostname::default"
+    ],
+    "platform": "ubuntu",
+    "platform_version": "20.04",
+    "cloud": null,
+    "chef_packages": {
+      "chef": {
+        "version": "17.9.52",
+        "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.9.52/lib",
+        "chef_effortless": null
+      },
+      "ohai": {
+        "version": "17.9.0",
+        "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/ohai-17.9.0/lib/ohai"
+      }
+    }
+  },
+  "run_list": [
+    "recipe[kosmos-base]",
+    "role[drone]"
+  ]
+}
\ No newline at end of file
diff --git a/nodes/fornax.kosmos.org.json b/nodes/fornax.kosmos.org.json
index cb290db..aa4a52b 100644
--- a/nodes/fornax.kosmos.org.json
+++ b/nodes/fornax.kosmos.org.json
@@ -19,6 +19,8 @@
       "kosmos-base::default",
       "kosmos_kvm::host",
       "kosmos_discourse::nginx",
+      "kosmos_gitea::nginx",
+      "kosmos_drone::nginx",
       "apt::default",
       "timezone_iii::default",
       "timezone_iii::debian",
@@ -63,6 +65,8 @@
   "run_list": [
     "recipe[kosmos-base]",
     "recipe[kosmos_kvm::host]",
-    "recipe[kosmos_discourse::nginx]"
+    "recipe[kosmos_discourse::nginx]",
+    "recipe[kosmos_gitea::nginx]",
+    "recipe[kosmos_drone::nginx]"
   ]
-}
+}
\ No newline at end of file
diff --git a/nodes/gitea-1.json b/nodes/gitea-1.json
new file mode 100644
index 0000000..e3ec3a2
--- /dev/null
+++ b/nodes/gitea-1.json
@@ -0,0 +1,61 @@
+{
+  "name": "gitea-1",
+  "normal": {
+    "knife_zero": {
+      "host": "10.1.1.36"
+    }
+  },
+  "automatic": {
+    "fqdn": "gitea-1",
+    "os": "linux",
+    "os_version": "5.4.0-1058-kvm",
+    "hostname": "gitea-1",
+    "ipaddress": "192.168.122.218",
+    "roles": [
+      "gitea",
+      "postgresql_client"
+    ],
+    "recipes": [
+      "kosmos-base",
+      "kosmos-base::default",
+      "kosmos_postgresql::hostsfile",
+      "kosmos_gitea",
+      "kosmos_gitea::default",
+      "kosmos_gitea::backup",
+      "apt::default",
+      "timezone_iii::default",
+      "timezone_iii::debian",
+      "ntp::default",
+      "ntp::apparmor",
+      "kosmos-base::systemd_emails",
+      "apt::unattended-upgrades",
+      "kosmos-base::firewall",
+      "kosmos-postfix::default",
+      "postfix::default",
+      "postfix::_common",
+      "postfix::_attributes",
+      "postfix::sasl_auth",
+      "hostname::default",
+      "backup::default",
+      "logrotate::default"
+    ],
+    "platform": "ubuntu",
+    "platform_version": "20.04",
+    "cloud": null,
+    "chef_packages": {
+      "chef": {
+        "version": "17.9.52",
+        "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.9.52/lib",
+        "chef_effortless": null
+      },
+      "ohai": {
+        "version": "17.9.0",
+        "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/ohai-17.9.0/lib/ohai"
+      }
+    }
+  },
+  "run_list": [
+    "recipe[kosmos-base]",
+    "role[gitea]"
+  ]
+}
\ No newline at end of file