diff --git a/base/api/deployment.yaml b/base/api/deployment.yaml
index 5803d31..9ca2820 100644
--- a/base/api/deployment.yaml
+++ b/base/api/deployment.yaml
@@ -20,6 +20,7 @@ spec:
       labels:
         app: api
     spec:
+      terminationGracePeriodSeconds: 30
       serviceAccountName: server-creator
       dnsConfig:
         options:
diff --git a/base/game-server-node-connector/daemonset.yaml b/base/game-server-node-connector/daemonset.yaml
index abe7598..15586e9 100644
--- a/base/game-server-node-connector/daemonset.yaml
+++ b/base/game-server-node-connector/daemonset.yaml
@@ -6,6 +6,10 @@ metadata:
   name: game-server-node-connector
   namespace: 5stack
 spec:
+  updateStrategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 1
   selector:
     matchLabels:
       app: game-server-node-connector
@@ -14,6 +18,7 @@ spec:
       labels:
         app: game-server-node-connector
     spec:
+      terminationGracePeriodSeconds: 30
       dnsConfig:
         options:
           - name: ndots
diff --git a/base/hasura/deployment.yaml b/base/hasura/deployment.yaml
index 6d41f5d..8ab3a0f 100644
--- a/base/hasura/deployment.yaml
+++ b/base/hasura/deployment.yaml
@@ -20,6 +20,7 @@ spec:
       labels:
         app: hasura
     spec:
+      terminationGracePeriodSeconds: 30
       dnsConfig:
         options:
           - name: ndots
diff --git a/setup-env.sh b/setup-env.sh
index e5512ef..18f1078 100755
--- a/setup-env.sh
+++ b/setup-env.sh
@@ -204,6 +204,11 @@ if [ -z "$WEB_DOMAIN" ] || [ -z "$WS_DOMAIN" ] || [ -z "$API_DOMAIN" ] || [ -z "
         echo "Base domain cannot be empty. Please enter your base domain (e.g. example.com):"
         read WEB_DOMAIN
     fi
+
+    if [ -z "$WEB_DOMAIN" ] || echo "$WEB_DOMAIN" | grep -q ' '; then
+        echo "ERROR: Invalid domain '$WEB_DOMAIN'. Domain must be non-empty and contain no spaces."
+        exit 1
+    fi
     
     echo "WEB_DOMAIN: $WEB_DOMAIN"
     update_env_var "overlays/config/api-config.env" "WEB_DOMAIN" "$WEB_DOMAIN"