diff --git a/.github/workflows/aws-preview.yml b/.github/workflows/aws-preview.yml
index d7d32d20..7e2fcd0d 100644
--- a/.github/workflows/aws-preview.yml
+++ b/.github/workflows/aws-preview.yml
@@ -51,7 +51,7 @@ jobs:
             --no-fail-on-empty-changeset \
             --config-file .aws/petercat-preview.toml \
             --parameter-overrides APIUrl="https://api-pre.petercat.ai" \
-                                  WebUrl="https://www.petercat.ai" \
+                                  WebUrl="https://petercat.ai" \
                                   StaticUrl="https://static.petercat.ai" \
                                   PetercatEnv="preview" \
                                   AWSGithubSecretName=${{ secrets.AWS_GITHUB_SECRET_NAME }} \
diff --git a/.github/workflows/aws-prod.yml b/.github/workflows/aws-prod.yml
index 14ee80ee..fe5c13b4 100644
--- a/.github/workflows/aws-prod.yml
+++ b/.github/workflows/aws-prod.yml
@@ -45,7 +45,7 @@ jobs:
             --no-fail-on-empty-changeset \
             --config-file .aws/petercat-prod.toml \
             --parameter-overrides APIUrl="https://api.petercat.ai" \
-                                  WebUrl="https://www.petercat.ai" \
+                                  WebUrl="https://petercat.ai" \
                                   StaticUrl="https://static.petercat.ai" \
                                   PetercatEnv="production" \
                                   AWSGithubSecretName=${{ secrets.AWS_GITHUB_SECRET_NAME }} \
diff --git a/assistant/ README.md b/assistant/ README.md
index a467c2f5..47ae792d 100644
--- a/assistant/ README.md	
+++ b/assistant/ README.md	
@@ -3,7 +3,7 @@
   [![npm](https://img.shields.io/npm/dm/petercatai/chat-sdk.svg)](https://www.npmjs.com/package/petercatai/chat-sdk)
   [![Version](https://img.shields.io/npm/v/petercatai/chat-sdk/latest.svg)](https://www.npmjs.com/package/petercatai/chat-sdk)
 
-chat-app is a UI component library based on dumi, designed for building [Peter Cat](https://www.petercat.ai) conversation interfaces.
+chat-app is a UI component library based on dumi, designed for building [Peter Cat](https://petercat.ai) conversation interfaces.
 
 
 ## Development
diff --git a/assistant/src/icons/SignatureIcon.tsx b/assistant/src/icons/SignatureIcon.tsx
index c1f22c66..b651f441 100644
--- a/assistant/src/icons/SignatureIcon.tsx
+++ b/assistant/src/icons/SignatureIcon.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 const SignatureIcon = (props: any) => (
-  <a href="https://www.petercat.ai/" className={props.className}>
+  <a href="https://petercat.ai/" className={props.className}>
     <svg xmlns="http://www.w3.org/2000/svg" width={99} height={11} fill="none">
       <path
         fill="#D1D5DB"
diff --git a/server/tests/fixtures/github/events/pull_request/create.json b/server/tests/fixtures/github/events/pull_request/create.json
index d53cfda9..560f5f70 100644
--- a/server/tests/fixtures/github/events/pull_request/create.json
+++ b/server/tests/fixtures/github/events/pull_request/create.json
@@ -150,7 +150,7 @@
           "ssh_url": "git@github.com:petercat-ai/petercat.git",
           "clone_url": "https://github.com/petercat-ai/petercat.git",
           "svn_url": "https://github.com/petercat-ai/petercat",
-          "homepage": "https://www.petercat.ai/",
+          "homepage": "https://petercat.ai/",
           "size": 28857,
           "stargazers_count": 3,
           "watchers_count": 3,
@@ -292,7 +292,7 @@
           "ssh_url": "git@github.com:petercat-ai/petercat.git",
           "clone_url": "https://github.com/petercat-ai/petercat.git",
           "svn_url": "https://github.com/petercat-ai/petercat",
-          "homepage": "https://www.petercat.ai/",
+          "homepage": "https://petercat.ai/",
           "size": 28857,
           "stargazers_count": 3,
           "watchers_count": 3,
@@ -452,7 +452,7 @@
       "ssh_url": "git@github.com:petercat-ai/petercat.git",
       "clone_url": "https://github.com/petercat-ai/petercat.git",
       "svn_url": "https://github.com/petercat-ai/petercat",
-      "homepage": "https://www.petercat.ai/",
+      "homepage": "https://petercat.ai/",
       "size": 28857,
       "stargazers_count": 3,
       "watchers_count": 3,
diff --git a/server/tests/fixtures/github/events/pull_request/edit.json b/server/tests/fixtures/github/events/pull_request/edit.json
index e1529ddf..aa6a86cc 100644
--- a/server/tests/fixtures/github/events/pull_request/edit.json
+++ b/server/tests/fixtures/github/events/pull_request/edit.json
@@ -249,7 +249,7 @@
       "ssh_url": "git@github.com:petercat-ai/petercat.git",
       "clone_url": "https://github.com/petercat-ai/petercat.git",
       "svn_url": "https://github.com/petercat-ai/petercat",
-      "homepage": "https://www.petercat.ai/",
+      "homepage": "https://petercat.ai/",
       "size": 28857,
       "stargazers_count": 3,
       "watchers_count": 3,
diff --git a/server/tests/fixtures/github/events/pull_request/review_comment.created.json b/server/tests/fixtures/github/events/pull_request/review_comment.created.json
index f86375aa..162e308a 100644
--- a/server/tests/fixtures/github/events/pull_request/review_comment.created.json
+++ b/server/tests/fixtures/github/events/pull_request/review_comment.created.json
@@ -223,7 +223,7 @@
           "ssh_url": "git@github.com:petercat-ai/petercat.git",
           "clone_url": "https://github.com/petercat-ai/petercat.git",
           "svn_url": "https://github.com/petercat-ai/petercat",
-          "homepage": "https://www.petercat.ai/",
+          "homepage": "https://petercat.ai/",
           "size": 28864,
           "stargazers_count": 3,
           "watchers_count": 3,
@@ -367,7 +367,7 @@
           "ssh_url": "git@github.com:petercat-ai/petercat.git",
           "clone_url": "https://github.com/petercat-ai/petercat.git",
           "svn_url": "https://github.com/petercat-ai/petercat",
-          "homepage": "https://www.petercat.ai/",
+          "homepage": "https://petercat.ai/",
           "size": 28864,
           "stargazers_count": 3,
           "watchers_count": 3,
@@ -517,7 +517,7 @@
       "ssh_url": "git@github.com:petercat-ai/petercat.git",
       "clone_url": "https://github.com/petercat-ai/petercat.git",
       "svn_url": "https://github.com/petercat-ai/petercat",
-      "homepage": "https://www.petercat.ai/",
+      "homepage": "https://petercat.ai/",
       "size": 28864,
       "stargazers_count": 3,
       "watchers_count": 3,
diff --git a/server/tests/fixtures/github/events/pull_request/review_comment.json b/server/tests/fixtures/github/events/pull_request/review_comment.json
index ec5bcd7f..691f1fa3 100644
--- a/server/tests/fixtures/github/events/pull_request/review_comment.json
+++ b/server/tests/fixtures/github/events/pull_request/review_comment.json
@@ -218,7 +218,7 @@
           "ssh_url": "git@github.com:petercat-ai/petercat.git",
           "clone_url": "https://github.com/petercat-ai/petercat.git",
           "svn_url": "https://github.com/petercat-ai/petercat",
-          "homepage": "https://www.petercat.ai/",
+          "homepage": "https://petercat.ai/",
           "size": 28857,
           "stargazers_count": 3,
           "watchers_count": 3,
@@ -360,7 +360,7 @@
           "ssh_url": "git@github.com:petercat-ai/petercat.git",
           "clone_url": "https://github.com/petercat-ai/petercat.git",
           "svn_url": "https://github.com/petercat-ai/petercat",
-          "homepage": "https://www.petercat.ai/",
+          "homepage": "https://petercat.ai/",
           "size": 28857,
           "stargazers_count": 3,
           "watchers_count": 3,
@@ -508,7 +508,7 @@
       "ssh_url": "git@github.com:petercat-ai/petercat.git",
       "clone_url": "https://github.com/petercat-ai/petercat.git",
       "svn_url": "https://github.com/petercat-ai/petercat",
-      "homepage": "https://www.petercat.ai/",
+      "homepage": "https://petercat.ai/",
       "size": 28857,
       "stargazers_count": 3,
       "watchers_count": 3,
diff --git a/server/tests/fixtures/github/events/pull_request/review_edit.json b/server/tests/fixtures/github/events/pull_request/review_edit.json
index 6e1f4cd7..2974beaa 100644
--- a/server/tests/fixtures/github/events/pull_request/review_edit.json
+++ b/server/tests/fixtures/github/events/pull_request/review_edit.json
@@ -188,7 +188,7 @@
           "ssh_url": "git@github.com:petercat-ai/petercat.git",
           "clone_url": "https://github.com/petercat-ai/petercat.git",
           "svn_url": "https://github.com/petercat-ai/petercat",
-          "homepage": "https://www.petercat.ai/",
+          "homepage": "https://petercat.ai/",
           "size": 28857,
           "stargazers_count": 3,
           "watchers_count": 3,
@@ -330,7 +330,7 @@
           "ssh_url": "git@github.com:petercat-ai/petercat.git",
           "clone_url": "https://github.com/petercat-ai/petercat.git",
           "svn_url": "https://github.com/petercat-ai/petercat",
-          "homepage": "https://www.petercat.ai/",
+          "homepage": "https://petercat.ai/",
           "size": 28857,
           "stargazers_count": 3,
           "watchers_count": 3,
@@ -479,7 +479,7 @@
       "ssh_url": "git@github.com:petercat-ai/petercat.git",
       "clone_url": "https://github.com/petercat-ai/petercat.git",
       "svn_url": "https://github.com/petercat-ai/petercat",
-      "homepage": "https://www.petercat.ai/",
+      "homepage": "https://petercat.ai/",
       "size": 28857,
       "stargazers_count": 3,
       "watchers_count": 3,
diff --git a/server/tests/fixtures/github/events/pull_request/review_submit.json b/server/tests/fixtures/github/events/pull_request/review_submit.json
index cf457226..e87fd651 100644
--- a/server/tests/fixtures/github/events/pull_request/review_submit.json
+++ b/server/tests/fixtures/github/events/pull_request/review_submit.json
@@ -188,7 +188,7 @@
           "ssh_url": "git@github.com:petercat-ai/petercat.git",
           "clone_url": "https://github.com/petercat-ai/petercat.git",
           "svn_url": "https://github.com/petercat-ai/petercat",
-          "homepage": "https://www.petercat.ai/",
+          "homepage": "https://petercat.ai/",
           "size": 28857,
           "stargazers_count": 3,
           "watchers_count": 3,
@@ -330,7 +330,7 @@
           "ssh_url": "git@github.com:petercat-ai/petercat.git",
           "clone_url": "https://github.com/petercat-ai/petercat.git",
           "svn_url": "https://github.com/petercat-ai/petercat",
-          "homepage": "https://www.petercat.ai/",
+          "homepage": "https://petercat.ai/",
           "size": 28857,
           "stargazers_count": 3,
           "watchers_count": 3,
@@ -478,7 +478,7 @@
       "ssh_url": "git@github.com:petercat-ai/petercat.git",
       "clone_url": "https://github.com/petercat-ai/petercat.git",
       "svn_url": "https://github.com/petercat-ai/petercat",
-      "homepage": "https://www.petercat.ai/",
+      "homepage": "https://petercat.ai/",
       "size": 28857,
       "stargazers_count": 3,
       "watchers_count": 3,
diff --git a/server/tests/fixtures/github/events/pull_request/review_thread.json b/server/tests/fixtures/github/events/pull_request/review_thread.json
index 83477626..f037ffce 100644
--- a/server/tests/fixtures/github/events/pull_request/review_thread.json
+++ b/server/tests/fixtures/github/events/pull_request/review_thread.json
@@ -149,7 +149,7 @@
           "ssh_url": "git@github.com:petercat-ai/petercat.git",
           "clone_url": "https://github.com/petercat-ai/petercat.git",
           "svn_url": "https://github.com/petercat-ai/petercat",
-          "homepage": "https://www.petercat.ai/",
+          "homepage": "https://petercat.ai/",
           "size": 28857,
           "stargazers_count": 3,
           "watchers_count": 3,
@@ -280,7 +280,7 @@
           "ssh_url": "git@github.com:petercat-ai/petercat.git",
           "clone_url": "https://github.com/petercat-ai/petercat.git",
           "svn_url": "https://github.com/petercat-ai/petercat",
-          "homepage": "https://www.petercat.ai/",
+          "homepage": "https://petercat.ai/",
           "size": 28857,
           "stargazers_count": 3,
           "watchers_count": 3,
@@ -559,7 +559,7 @@
       "ssh_url": "git@github.com:petercat-ai/petercat.git",
       "clone_url": "https://github.com/petercat-ai/petercat.git",
       "svn_url": "https://github.com/petercat-ai/petercat",
-      "homepage": "https://www.petercat.ai/",
+      "homepage": "https://petercat.ai/",
       "size": 28857,
       "stargazers_count": 3,
       "watchers_count": 3,