diff --git a/common/woodpeckerci.conf b/common/woodpeckerci.conf
index f9645d3..6800c04 100644
--- a/common/woodpeckerci.conf
+++ b/common/woodpeckerci.conf
@@ -1,3 +1,6 @@
+add_header Onion-Location http://ci.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion$request_uri;
+add_header X-I2P-Location http://vernp46vgdvbfjlxibqbmlk2wxckgjvnoj5ixjdkdr2n773mra4a.b32.i2p$request_uri;
+
 location / {
         proxy_set_header X-Forwarded-For $remote_addr;
         proxy_set_header X-Forwarded-Proto $scheme;
diff --git a/conf.d/bbs.conf b/conf.d/bbs.conf
index d520e86..d22f245 100644
--- a/conf.d/bbs.conf
+++ b/conf.d/bbs.conf
@@ -2,7 +2,7 @@ server {
 	listen 80;
 	listen [::]:80;
 
-	server_name bbs.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion;
+	server_name vern5pgpfjdplnz7yhqazesx62hrx6r6i4xvv4kjshwefwikkjjuvwad.onion;
 
 	subs_filter_types text/html text/css text/xml application/javascript text/plain;
 	subs_filter "ftelnet.vern.cc" "ftelnet.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion";
diff --git a/conf.d/matrix.conf b/conf.d/matrix.conf
index 930d95c..c86f20b 100644
--- a/conf.d/matrix.conf
+++ b/conf.d/matrix.conf
@@ -45,54 +45,6 @@ server {
 	}
 }
 
-server {
-	listen 443 ssl http2;
-	listen [::]:443 ssl http2;
-	include snippets/lets-encrypt.conf;
-
-#	listen 8449 default_server;
-#	listen [::]:8449 default_server;
-
-	server_name mtrx.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion;
-
-	add_header Onion-Location http://mtrx.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion$request_uri;
-
-	subs_filter_types application/json;
-	subs_filter "{\"base_url\":\"https://mtrx.vern.cc/\"}" "{\"base_url\":\"https://mtrx.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion/\"}";
-
-	location ~ ^(/_matrix|/_synapse/client) {
-		# note: do not add a path (even a single /) after the port in `proxy_pass`,
-		# otherwise nginx will canonicalise the URI and cause signature verification
-		# errors.
-		proxy_pass http://localhost:8008;
-		proxy_set_header X-Forwarded-For $remote_addr;
-		proxy_set_header X-Forwarded-Proto $scheme;
-		proxy_set_header Host $host;
-
-		# Nginx by default only allows file uploads up to 1M in size
-		# Increase client_max_body_size to match max_upload_size defined in homeserver.yaml
-		client_max_body_size 1024M;
-	}
-	## well-known
-	location /.well-known/matrix/support {
-		add_header Access-Control-Allow-Origin '*' always;
-		add_header Content-Type application/json;
-		return 200 '{"admins": [{"matrix_id": "@root:vern.cc", "email_address": "tildemaster@vern.cc", "role": "admin"}], "support_page": "https://matrix.to/#/#vern:vern.cc"}';
-	}
-
-	location /.well-known/matrix/server {
-		add_header Access-Control-Allow-Origin '*' always;
-		add_header Content-Type application/json;
-		return 200 '{"m.server": "mtrx.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion:80"}';
-	}
-
-	location /.well-known/matrix/client {
-		add_header Access-Control-Allow-Origin '*' always;
-		add_header Content-Type application/json;
-		return 200 '{"m.homeserver": {"base_url": "https://mtrx.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion:8008"}}';
-	}
-}
-
 server {
 	listen 11043;
 	listen [::]:11043;
diff --git a/conf.d/woodpecker.conf b/conf.d/woodpecker.conf
index 442b8da..77c5261 100644
--- a/conf.d/woodpecker.conf
+++ b/conf.d/woodpecker.conf
@@ -1,3 +1,19 @@
+server {
+	listen 80;
+	listen [::]:80;
+	server_name ci.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion;
+
+	include common/woodpeckerci.conf;
+}
+
+server {
+	listen 11068;
+	listen [::]:11068;
+	server_name vernp46vgdvbfjlxibqbmlk2wxckgjvnoj5ixjdkdr2n773mra4a.b32.i2p;
+
+	include common/woodpeckerci.conf;
+}
+
 server {
 	listen 443 ssl http2;
 	listen [::]:443 ssl http2;