diff --git a/BUILD-INSTRUCTIONS.md b/BUILD-INSTRUCTIONS.md
index bb7d3fc..406de04 100644
--- a/BUILD-INSTRUCTIONS.md
+++ b/BUILD-INSTRUCTIONS.md
@@ -9,14 +9,14 @@ cloudron build \
   --set-build-service builder.docker.due.ren \
   --build-service-token e3265de06b1d0e7bb38400539012a8433a74c2c96a17955e \
   --set-repository andreasdueren/ente-cloudron \
-  --tag 0.5.2
+  --tag 0.5.3
 ```
 
 ## Install
 ```bash
 cloudron install \
   --location ente.due.ren \
-  --image andreasdueren/ente-cloudron:0.5.2
+  --image andreasdueren/ente-cloudron:0.5.3
 ```
 
 ## After Install
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46105e8..ce39249 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@
 
 * Allow httpPort hostnames like `cast.ente`/`accounts.ente` so Cloudron can append the primary domain (`.due.ren`) automatically
 
+## 0.5.3 (2025-11-05)
+
+* Fix regression that could produce duplicated suffixes (e.g. `cast.due.due.ren`) when httpPort hostnames already included the full domain
+
 ## 0.5.0 (2025-11-04)
 
 * Proxy Museum GET/HEAD routes (e.g. `/collections`, `/files`, `/remote-store`) so clients that talk to the primary host without `/api` still hit the backend
diff --git a/CloudronManifest.json b/CloudronManifest.json
index f4d206a..0f30ad0 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -7,7 +7,7 @@
   "contactEmail": "contact@ente.io",
   "website": "https://ente.io",
   "tagline": "Open source, end-to-end encrypted photo backup",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "upstreamVersion": "git-main",
   "healthCheckPath": "/health",
   "httpPort": 3080,
diff --git a/start.sh b/start.sh
index 83cbb7d..f10690b 100755
--- a/start.sh
+++ b/start.sh
@@ -110,13 +110,13 @@ FAMILY_HOST="$(resolve_http_hostname "FAMILY_DOMAIN" "family.${APP_FQDN}")"
 
 normalize_host() {
   local host="$1"
-  # Replace trailing shared domain with the app domain if present (allows values like cast.ente)
+  local suffix=".${APP_FQDN#*.}"
   case "$host" in
-    *".${APP_FQDN#*.}")
-      printf '%s\n' "${host%.*}.${APP_FQDN#*.}"
+    *"$suffix")
+      printf '%s\n' "$host"
       ;;
     *)
-      printf '%s\n' "$host"
+      printf '%s%s\n' "$host" "$suffix"
       ;;
   esac
 }