diff --git a/services/pages/pages.go b/services/pages/pages.go
index 873f450762..8e7a4b1744 100644
--- a/services/pages/pages.go
+++ b/services/pages/pages.go
@@ -172,8 +172,8 @@ func DisablePages(ctx context.Context, repo *repo_model.Repository) error {
 
 // GetPagesSubdomain returns the subdomain for a repository's pages
 func GetPagesSubdomain(repo *repo_model.Repository) string {
-	// Format: {repo}.{owner}.pages.{domain}
-	return fmt.Sprintf("%s.%s", strings.ToLower(repo.Name), strings.ToLower(repo.OwnerName))
+	// Format: {repo}-{owner}.{domain}
+	return fmt.Sprintf("%s-%s", strings.ToLower(repo.Name), strings.ToLower(repo.OwnerName))
 }
 
 // GetPagesURL returns the full URL for a repository's pages
@@ -182,7 +182,7 @@ func GetPagesURL(repo *repo_model.Repository) string {
 	// This should be configurable
 	// Extract domain from settings
 	domain := setting.Domain
-	return fmt.Sprintf("https://%s.pages.%s", subdomain, domain)
+	return fmt.Sprintf("https://%s.%s", subdomain, domain)
 }
 
 // GetPagesDomains returns all custom domains for a repository's pages