diff --git a/nginx/sites-available/api.r3js.org.conf b/nginx/sites-available/api.r3js.org.conf
index 9ba0689..3e5a984 100644
--- a/nginx/sites-available/api.r3js.org.conf
+++ b/nginx/sites-available/api.r3js.org.conf
@@ -1,4 +1,4 @@
-upstream node-api {
+upstream node-beta-api {
 	server 127.0.0.1:3104;
 }
 
@@ -6,9 +6,9 @@ server {
 	listen 80;
 	listen [::]:80;
 	
-	server_name api.r3js.org;
+	server_name beta.api.r3js.org;
 
-	return 301 https://api.r3js.org$request_uri;
+	return 301 https://beta.api.r3js.org$request_uri;
 }
 
 server {
@@ -16,21 +16,19 @@ server {
 	listen 443 ssl;
 	listen [::]:443;
 	
-	server_name api.r3js.org;
+	server_name beta.api.r3js.org;
 	
-	ssl_certificate /etc/letsencrypt/live/api.r3js.org/fullchain.pem;
-	ssl_certificate_key /etc/letsencrypt/live/api.r3js.org/privkey.pem;
-	include /etc/letsencrypt/options-ssl-nginx.conf;
-	ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+	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;
 	
-	root /usr/share/r3-server/live/api.r3js.org/webroot;
-
-	access_log /var/log/api.r3js.org/access.log;
-	error_log /var/log/api.r3js.org/error.log;
+	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' always;
+        add_header Access-Control-Allow-Headers 'Cache-Control,Content-Type,x-api-authorization,x-api-user-token' always;
         add_header Content-Type 'application/json' always;
         add_header X-Content-Type-Options: 'nosniff' always;
 
@@ -38,6 +36,8 @@ server {
                 return 200;
         }
 
+	root /usr/share/r3-server/beta/api.r3js.org/webroot;
+
 	location ~ {
 		try_files $uri $uri/ @node;
 	}
@@ -51,11 +51,11 @@ server {
 
 		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' always;
+		add_header Access-Control-Allow-Headers 'Cache-Control,Content-Type,x-api-authorization,x-api-user-token' always;
 		add_header Content-Type 'application/json' always;
 		add_header X-Content-Type-Options: 'nosniff' always;
 
-		proxy_pass http://node-api$request_uri;
+		proxy_pass http://node-beta-api$request_uri;
 
 	}
 }
diff --git a/nginx/sites-available/editor.r3js.org.conf b/nginx/sites-available/editor.r3js.org.conf
index 64b2fe3..0c8f6cf 100644
--- a/nginx/sites-available/editor.r3js.org.conf
+++ b/nginx/sites-available/editor.r3js.org.conf
@@ -2,9 +2,9 @@ server {
 	listen 80;
 	listen [::]:80;
 	
-	server_name editor.r3js.org;
+	server_name beta.editor.r3js.org;
 
-	return 301 https://editor.r3js.org$request_uri;
+	return 301 https://beta.editor.r3js.org$request_uri;
 }
 
 server {
@@ -12,18 +12,18 @@ server {
 	listen 443 ssl;
 	listen [::]:443;
 	
-	server_name editor.r3js.org;
+	server_name beta.editor.r3js.org;
 	
-	ssl_certificate /etc/letsencrypt/live/editor.r3js.org/fullchain.pem;
-	ssl_certificate_key /etc/letsencrypt/live/editor.r3js.org/privkey.pem;
-	include /etc/letsencrypt/options-ssl-nginx.conf;
-	ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+	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/cybafelo/editor.r3js.org/webroot/;
+	root /usr/share/r3-server/beta/editor.r3js.org/webroot/;
 	index index.php;
 
-	access_log /var/log/editor.r3js.org/access.log;
-	error_log /var/log/editor.r3js.org/error.log;
+	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;
diff --git a/r3-beta-api.service b/r3-beta-api.service
new file mode 100644
index 0000000..70f3994
--- /dev/null
+++ b/r3-beta-api.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=R3 Beta API
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/share/r3-server/beta/api.r3js.org/src/start
+PIDFile=/var/run/beta-api.pid
+TimeoutStopSec=0
+Restart=always
+User=www-data
+Group=www-data
+
+[Install]
+WantedBy=multi-user.target
diff --git a/r3-beta-build.service b/r3-beta-build.service
new file mode 100644
index 0000000..ce62040
--- /dev/null
+++ b/r3-beta-build.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=R3 Beta Source Code Build Service
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/local/lib/node-v10.16.0-linux-x64/bin/gulp --gulpfile /usr/share/r3-server/beta/r3/gulpfile.js
+PIDFile=/var/run/beta-source.pid
+TimeoutStopSec=0
+Restart=always
+User=www-data
+Group=www-data
+
+[Install]
+WantedBy=multi-user.target