diff --git a/server/cmd/museum/main.go b/server/cmd/museum/main.go
index e3301fe6db..cc10a67e8b 100644
--- a/server/cmd/museum/main.go
+++ b/server/cmd/museum/main.go
@@ -98,6 +98,7 @@ func main() {
 	}
 
 	viper.SetDefault("apps.public-albums", "https://albums.ente.io")
+	viper.SetDefault("apps.custom-domain.cname", "https://my.ente.io")
 	viper.SetDefault("apps.public-locker", "https://locker.ente.io")
 	viper.SetDefault("apps.accounts", "https://accounts.ente.io")
 	viper.SetDefault("apps.cast", "https://cast.ente.io")
diff --git a/server/configurations/local.yaml b/server/configurations/local.yaml
index a16f560e43..806add1428 100644
--- a/server/configurations/local.yaml
+++ b/server/configurations/local.yaml
@@ -95,6 +95,9 @@ apps:
     accounts:
     # Default is https://family.ente.io
     family:
+    custom-domain:
+        # Default is https://my.ente.io
+        cname:
 
 # Database connection parameters
 db:
diff --git a/server/ente/remotestore.go b/server/ente/remotestore.go
index 69f29cf543..d08181f72c 100644
--- a/server/ente/remotestore.go
+++ b/server/ente/remotestore.go
@@ -33,6 +33,7 @@ type FeatureFlagResponse struct {
 	EnableMobMultiPart  bool    `json:"enableMobMultiPart"`
 	CastUrl             string  `json:"castUrl"`
 	CustomDomain        *string `json:"customDomain,omitempty"`
+	CustomDomainCNAME   string  `json:"customDomainCNAME,omitempty"`
 }
 
 type FlagKey string
diff --git a/server/pkg/controller/remotestore/controller.go b/server/pkg/controller/remotestore/controller.go
index 77d00947d4..bbbe741799 100644
--- a/server/pkg/controller/remotestore/controller.go
+++ b/server/pkg/controller/remotestore/controller.go
@@ -75,6 +75,7 @@ func (c *Controller) GetFeatureFlags(ctx *gin.Context) (*ente.FeatureFlagRespons
 		// except internal user.rt
 		EnableMobMultiPart: true,
 		CastUrl:            viper.GetString("apps.cast"),
+		CustomDomainCNAME:  viper.GetString("apps.custom-domain.cname"),
 	}
 	for key, value := range values {
 		flag := ente.FlagKey(key)