diff --git a/charts/magout/templates/gateway.yaml b/charts/magout/templates/gateway.yaml
index 7c71fce..d3c65c8 100644
--- a/charts/magout/templates/gateway.yaml
+++ b/charts/magout/templates/gateway.yaml
@@ -115,7 +115,7 @@ data:
     server {
       listen 80;
       listen [::]:80;
-      server_name {{ .Values.gateway.serverName }};
+      server_name {{ .Values.serverName }};
     
       keepalive_timeout    70;
       sendfile             on;
diff --git a/charts/magout/values.yaml b/charts/magout/values.yaml
index 2743890..a0bfd8b 100644
--- a/charts/magout/values.yaml
+++ b/charts/magout/values.yaml
@@ -4,6 +4,8 @@
 
 fullnameOverride: ""
 
+serverName: "" # CHANGE HERE
+
 mastodonVersion:
   image: ghcr.io/mastodon/mastodon:v4.2.12
   streamingImage: ghcr.io/mastodon/mastodon:v4.2.12
@@ -120,7 +122,6 @@ controller:
   affinity: {}
 
 gateway:
-  serverName: "" # CHANGE HERE
   deploy:
     replicas: 1
     image: nginx:1
diff --git a/test/e2e/testdata/values-v4.2.12.yaml b/test/e2e/testdata/values-v4.2.12.yaml
index 74fe601..a32c988 100644
--- a/test/e2e/testdata/values-v4.2.12.yaml
+++ b/test/e2e/testdata/values-v4.2.12.yaml
@@ -1,12 +1,11 @@
 fullnameOverride: "mastodon0"
 
+serverName: mastodon.test
+
 mastodonVersion:
   image: ghcr.io/mastodon/mastodon:v4.2.12
   streamingImage: ghcr.io/mastodon/mastodon:v4.2.12
 
-gateway:
-  serverName: mastodon.test
-
 mastodonServer:
   sidekiq:
     annotations:
diff --git a/test/e2e/testdata/values-v4.3.0b1-restart.yaml b/test/e2e/testdata/values-v4.3.0b1-restart.yaml
index bbffb8a..7dce65a 100644
--- a/test/e2e/testdata/values-v4.3.0b1-restart.yaml
+++ b/test/e2e/testdata/values-v4.3.0b1-restart.yaml
@@ -1,12 +1,11 @@
 fullnameOverride: "mastodon0"
 
+serverName: mastodon.test
+
 mastodonVersion:
   image: ghcr.io/mastodon/mastodon:4.3.0b1
   streamingImage: ghcr.io/mastodon/mastodon-streaming:4.3.0b1
 
-gateway:
-  serverName: mastodon.test
-
 mastodonServer:
   sidekiq:
     annotations:
diff --git a/test/e2e/testdata/values-v4.3.0b1.yaml b/test/e2e/testdata/values-v4.3.0b1.yaml
index cef028d..e1c5d52 100644
--- a/test/e2e/testdata/values-v4.3.0b1.yaml
+++ b/test/e2e/testdata/values-v4.3.0b1.yaml
@@ -1,12 +1,11 @@
 fullnameOverride: "mastodon0"
 
+serverName: mastodon.test
+
 mastodonVersion:
   image: ghcr.io/mastodon/mastodon:4.3.0b1
   streamingImage: ghcr.io/mastodon/mastodon-streaming:4.3.0b1
 
-gateway:
-  serverName: mastodon.test
-
 mastodonServer:
   sidekiq:
     annotations: