diff --git a/build/secure.js b/build/secure.js
index 3325ed8..39081be 100644
--- a/build/secure.js
+++ b/build/secure.js
@@ -1,8 +1,8 @@
 var secure = {
     api: {
-        port: 3104,
-        debugPort: 3204,
-        customCodePath: '/usr/share/fs/beta/r3-custom-code',
+        port: 3002,
+        debugPort: 3003,
+        customCodePath: '/usr/share/r3-server/beta/r3-custom-code',
 	    serverPassword: '"kent sent me" motherfucker!'
     },
     websocket: {
@@ -13,7 +13,7 @@ var secure = {
         mongo : {
             original : {
                 host: 'mongodb://127.0.0.1',
-                db: 'fs',
+                db: 'beta',
                 port: 27017,
                 shardPort: 27018,
                 options: {
diff --git a/src/api.r3js.org.conf b/src/api.r3js.org.conf
new file mode 100644
index 0000000..468111b
--- /dev/null
+++ b/src/api.r3js.org.conf
@@ -0,0 +1,66 @@
+upstream node-beta-api {
+	server 127.0.0.1:3002;
+}
+
+server {
+	listen 80;
+	listen [::]:80;
+	
+	server_name beta.api.r3js.org;
+
+	return 301 https://beta.api.r3js.org$request_uri;
+}
+
+server {
+
+	listen 443 ssl;
+	listen [::]:443;
+	
+	server_name beta.api.r3js.org;
+	
+	ssl_certificate /etc/letsencrypt/live/beta.api.r3js.org/fullchain.pem;
+	ssl_certificate_key /etc/letsencrypt/live/beta.api.r3js.org/privkey.pem;
+	ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
+	ssl_ciphers         HIGH:!aNULL:!MD5;
+	
+	access_log /var/log/beta.api.r3js.org/access.log;
+	error_log /var/log/beta.api.r3js.org/error.log;
+
+        add_header Access-Control-Allow-Origin '*' always;
+        add_header Access-Control-Allow-Methods 'POST, GET, OPTIONS' always;
+        add_header Access-Control-Allow-Headers 'Cache-Control,Content-Type,x-api-authorization,x-api-user-token,x-authorization' always;
+        add_header X-Content-Type-Options: 'nosniff' always;
+		add_header Accept-Encoding 'gzip, deflate';
+
+        if ($request_method = OPTIONS) {
+                return 200;
+        }
+
+	root /usr/share/r3-server/beta/api.r3js.org/webroot;
+
+	location ~ ^.*\.css$ {
+        	add_header Content-Type 'text/css' always;
+		try_files $uri $uri/ @node;
+	}
+
+	location ~ {
+		try_files $uri $uri @node;
+	}
+
+	location @node {
+	
+		proxy_pass_request_headers on;
+		proxy_set_header X-Real-IP $remote_addr;
+		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+		proxy_set_header X-NginX-Proxy true;
+
+		add_header Access-Control-Allow-Origin '*' always;
+		add_header Access-Control-Allow-Methods 'POST, GET, OPTIONS' always;
+		add_header Access-Control-Allow-Headers 'Cache-Control,Content-Type,x-api-authorization,x-api-user-token,x-authorization' always;
+		add_header Content-Type 'application/json' always;
+		add_header X-Content-Type-Options: 'nosniff' always;
+
+		proxy_pass http://node-beta-api$request_uri;
+
+	}
+}
diff --git a/src/editor.r3js.org.conf b/src/editor.r3js.org.conf
new file mode 100644
index 0000000..0c8f6cf
--- /dev/null
+++ b/src/editor.r3js.org.conf
@@ -0,0 +1,40 @@
+server {
+	listen 80;
+	listen [::]:80;
+	
+	server_name beta.editor.r3js.org;
+
+	return 301 https://beta.editor.r3js.org$request_uri;
+}
+
+server {
+
+	listen 443 ssl;
+	listen [::]:443;
+	
+	server_name beta.editor.r3js.org;
+	
+	ssl_certificate /etc/letsencrypt/live/beta.editor.r3js.org/fullchain.pem;
+	ssl_certificate_key /etc/letsencrypt/live/beta.editor.r3js.org/privkey.pem;
+	ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
+	ssl_ciphers         HIGH:!aNULL:!MD5;
+	
+	root /usr/share/r3-server/beta/editor.r3js.org/webroot/;
+	index index.php;
+
+	access_log /var/log/beta.editor.r3js.org/access.log;
+	error_log /var/log/beta.editor.r3js.org/error.log;
+
+	location / {
+		try_files $uri $uri/ /index.php?$args;
+	}
+
+	location ~ \.php$ {
+		try_files $uri =404;
+		include fastcgi_params;
+		fastcgi_pass unix:/run/php/php7.2-fpm.sock;
+		fastcgi_index index.php;
+        	fastcgi_intercept_errors on;
+        	fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+	}
+}
diff --git a/src/r3-beta-api.service b/src/r3-beta-api.service
index a522ab6..70f3994 100644
--- a/src/r3-beta-api.service
+++ b/src/r3-beta-api.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=simple
-ExecStart=/usr/share/fs/beta/r3-api.flyingspoon.de/src/start
+ExecStart=/usr/share/r3-server/beta/api.r3js.org/src/start
 PIDFile=/var/run/beta-api.pid
 TimeoutStopSec=0
 Restart=always
diff --git a/src/r3-beta-build.service b/src/r3-beta-build.service
index 11ebcc7..488886e 100644
--- a/src/r3-beta-build.service
+++ b/src/r3-beta-build.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=simple
-ExecStart=/usr/local/bin/gulp --gulpfile /usr/share/fs/beta/r3/gulpfile.js
+ExecStart=/usr/local/bin/gulp --gulpfile /usr/share/r3-server/beta/r3/gulpfile.js
 PIDFile=/var/run/beta-source.pid
 TimeoutStopSec=0
 Restart=always
diff --git a/src/secure.js b/src/secure.js
index f2fcc79..39081be 100644
--- a/src/secure.js
+++ b/src/secure.js
@@ -1,7 +1,7 @@
 var secure = {
     api: {
-        port: 3104,
-        debugPort: 3204,
+        port: 3002,
+        debugPort: 3003,
         customCodePath: '/usr/share/r3-server/beta/r3-custom-code',
 	    serverPassword: '"kent sent me" motherfucker!'
     },