diff --git a/privfrontends/compose/hyperpipe/compose.yml.j2 b/privfrontends/compose/hyperpipe/compose.yml.j2
index af33a61..ef53565 100644
--- a/privfrontends/compose/hyperpipe/compose.yml.j2
+++ b/privfrontends/compose/hyperpipe/compose.yml.j2
@@ -5,14 +5,14 @@ services:
     image: codeberg.org/hyperpipe/hyperpipe:latest
     container_name: hyperpipe-frontend
     restart: unless-stopped
-    entrypoint: sh -c 'find /usr/share/nginx/html -type f -exec sed -i s/pipedapi.kavin.rocks/{% if inventory_hostname == 'eu' %}api.piped.projectsegfau.lt{%else%}pipedapi.{{inventory_hostname}}.projectsegfau.lt{%endif%}/g {} \; -exec sed -i s/hyperpipeapi.onrender.com/hyperpipebackend.{{ inventory_hostname }}.projectsegfau.lt/g {} \; && /docker-entrypoint.sh && nginx -g "daemon off;"'
+    entrypoint: sh -c 'find /usr/share/nginx/html -type f -exec sed -i s/pipedapi.kavin.rocks/{% if server_prefix == 'eu' %}api.piped.projectsegfau.lt{%else%}pipedapi.{{server_prefix}}.projectsegfau.lt{%endif%}/g {} \; -exec sed -i s/hyperpipeapi.onrender.com/hyperpipebackend.{{ server_prefix }}.projectsegfau.lt/g {} \; && /docker-entrypoint.sh && nginx -g "daemon off;"'
     ports:
       - '8843:80'
   hyperpipe-backend:
     image: codeberg.org/hyperpipe/hyperpipe-backend:latest
     container_name: hyperpipe-backend
     environment:
-      - HYP_PROXY={% if inventory_hostname == 'eu' %}proxy.piped.projectsegfau.lt{%else%}pipedproxy.{{inventory_hostname}}.projectsegfau.lt{%endif%}
+      - HYP_PROXY={% if server_prefix == 'eu' %}proxy.piped.projectsegfau.lt{%else%}pipedproxy.{{server_prefix}}.projectsegfau.lt{%endif%}
 
     restart: unless-stopped
     ports:
diff --git a/privfrontends/compose/safetwitch/compose.yml.j2 b/privfrontends/compose/safetwitch/compose.yml.j2
index f96d209..180ae50 100644
--- a/privfrontends/compose/safetwitch/compose.yml.j2
+++ b/privfrontends/compose/safetwitch/compose.yml.j2
@@ -5,7 +5,7 @@ services:
     ports:
       - "5070:80"
     environment:
-      - SAFETWITCH_BACKEND_DOMAIN=api.safetwitch.{{inventory_hostname}}.projectsegfau.lt
+      - SAFETWITCH_BACKEND_DOMAIN=api.safetwitch.{{server_prefix}}.projectsegfau.lt
       - SAFETWITCH_INSTANCE_DOMAIN=safetwitch.projectsegfau.lt
       - SAFETWITCH_HTTPS=true
     restart: always
@@ -15,5 +15,5 @@ services:
       - "5071:7000"
     environment:
       - PORT=7000
-      - URL=https://api.safetwitch.{{inventory_hostname}}.projectsegfau.lt
+      - URL=https://api.safetwitch.{{server_prefix}}.projectsegfau.lt
     restart: always
diff --git a/privfrontends/compose/searxng/compose.yml.j2 b/privfrontends/compose/searxng/compose.yml.j2
index cbfd540..eab61a6 100644
--- a/privfrontends/compose/searxng/compose.yml.j2
+++ b/privfrontends/compose/searxng/compose.yml.j2
@@ -29,7 +29,7 @@ services:
       - ./searxng:/etc/searxng:rw
       - ./extras.conf:/etc/searxng/settings.yml:rw
     environment:
-      - SEARXNG_BASE_URL=https://search.{{inventory_hostname}}.projectsegfau.lt/
+      - SEARXNG_BASE_URL=https://{% if server_prefix == 'eu' %}search.projectsegfau.lt{%else%}search.{{inventory_hostname}}.projectsegfau.lt{%endif%}/
     cap_drop:
       - ALL
     cap_add:
diff --git a/privfrontends/templates/Caddyfile.j2 b/privfrontends/templates/Caddyfile.j2
index 2c36259..b919929 100644
--- a/privfrontends/templates/Caddyfile.j2
+++ b/privfrontends/templates/Caddyfile.j2
@@ -246,7 +246,7 @@ search.{{ server_prefix }}.projectsegfau.lt search.projectsegfau.lt s.psf.lt s.{
                 Content-Security-Policy "upgrade-insecure-requests; default-src 'none'; script-src 'self'; style-src 'self' 'unsafe-inline'; form-action 'self' https://github.com/searxng/searxng/issues/new; font-src 'self'; frame-ancestors 'self'; base-uri 'self'; connect-src 'self' https://overpass-api.de; img-src 'self' data: https://*.tile.openstreetmap.org; frame-src https://www.youtube-nocookie.com https://player.vimeo.com https://www.dailymotion.com https://www.deezer.com https://www.mixcloud.com https://w.soundcloud.com https://embed.spotify.com"
         }
 }
-piped.{{ server_prefix }}.projectsegfau.lt pipedproxy.{{ server_prefix }}.projectsegfau.lt pipedapi.{{ server_prefix }}.projectsegfau.lt {
+{% if server_prefix == 'eu' %}piped.projectsegfau.lt proxy.piped.projectsegfau.lt api.piped.projectsegfau.lt {%else%} piped.{{ server_prefix }}.projectsegfau.lt pipedproxy.{{ server_prefix }}.projectsegfau.lt pipedapi.{{ server_prefix }}.projectsegfau.lt {%endif%} {
         reverse_proxy {% if inventory_hostname == 'core' %}192.168.5.2{% endif %}:6970
         header {
                 # disable FLoC tracking
@@ -277,9 +277,9 @@ piped.{{ server_prefix }}.projectsegfau.lt pipedproxy.{{ server_prefix }}.projec
         import acmedns
 		{% endif %}
 }
-pi.{{ server_prefix }}.psf.lt {
+pi.{{ server_prefix }}.psf.lt pi.psf.lt {
         reverse_proxy {% if inventory_hostname == 'core' %}192.168.5.2{% endif %}:6970 {
-                header_up Host "piped.{{ server_prefix }}.projectsegfau.lt"
+                header_up Host "{% if server_prefix == 'eu' %}piped.projectsegfau.lt{%else%}piped.{{ server_prefix }}.projectsegfau.lt{%endif%}"
         }
         header {
                 # disable FLoC tracking