diff --git a/cmd/rio/main.go b/cmd/rio/main.go
index ebf6216..dfd76fe 100644
--- a/cmd/rio/main.go
+++ b/cmd/rio/main.go
@@ -68,7 +68,7 @@ func Handler(pagesDomain, giteaUrl, defaultCsp string, giteaClient *repo.GiteaCl
 
 		if strings.HasSuffix(cname, pagesDomain) {
 			log.Debugf("%s is alias of %s and can be handled after a CNAME query", req.Host, cname)
-			handleSubdomain(cname, cname, req.URL.Path, giteaUrl, defaultCsp, giteaClient, w)
+			handleSubdomain(req.Host, cname, req.URL.Path, giteaUrl, defaultCsp, giteaClient, w)
 			return
 		}
 
diff --git a/internal/repo/repo.go b/internal/repo/repo.go
index 2dc7862..c879be8 100644
--- a/internal/repo/repo.go
+++ b/internal/repo/repo.go
@@ -86,7 +86,7 @@ func lookupRepositoryAndCache(username, reponame, branchName, host, domain, path
 
 		log.Debugf("CNAME Content: %s", cnameContent)
 		if cnameContent != cname {
-			log.Warnf("CNAME mismatch: Got '%s', expected '%s'", cname, cnameContent)
+			log.Warnf("CNAME mismatch: Repo '%s', CNAME '%s'", cnameContent, cname)
 			return nil, errors.New("CNAME mismatch")
 		}
 	}