diff --git a/Dockerfile b/Dockerfile
index e730095..9d17dcb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:5.3
 MAINTAINER "Huan <zixia@zixia.net>"
 LABEL maintainer="Huan <zixia@zixia.net>"
-LABEL org.opencontainers.image.source="https://github.com/zixia/bbs.zixia.net"
+LABEL org.opencontainers.image.source="https://github.com/zixia/bbs"
 
 # BBS SSH
 EXPOSE 22
diff --git a/Makefile b/Makefile
index a830c07..fda5af6 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ test:
 
 .PHONY: build
 build:
-	docker build -t bbs.zixia.net .
+	docker build -t bbs .
 
 .PHONY: run
 run:
@@ -15,11 +15,11 @@ run:
 
 .PHONY: pull
 pull:
-	docker pull ghcr.io/zixia/bbs.zixia.net
+	docker pull ghcr.io/zixia/bbs
 
 .PHONY: clean
 clean:
-	docker rmi bbs.zixia.net
+	docker rmi bbs
 
 .PHONY: version
 version:
diff --git a/README.md b/README.md
index 00cacaf..bef88f2 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,14 @@
 # 大话西游 zixia BBS
 
-- README: <https://www.zixia.net/bbs.zixia.net>
-- GitHub: <https://github.com/zixia/bbs.zixia.net>
+- README: <https://www.zixia.net/bbs>
+- GitHub: <https://github.com/zixia/bbs>
 - Term: <a href="telnet://bbs.zixia.net">telnet://bbs.zixia.net</a>
 
 ![大话西游紫霞BBS](docs/images/zixia-bbs-login.png)
 
 zixia BBS is a famouse BBS ([Bulletin Board System](https://en.wikipedia.org/wiki/Bulletin_board_system)) in Tsinghua university founded in 1998, created by Huan who's id is `zixia`. The zixia BBS is built on top of the source code of the largest campus BBS [水木清华BBS/水木社区](https://newsmth.net): [KBS_BBS](http://kcn.cn/) system, maintained by [KCN](http://kcn.cn).
 
-For any questions and support request, please go to our GitHub discussion at <https://github.com/zixia/bbs.zixia.net/discussions>
+For any questions and support request, please go to our GitHub discussion at <https://github.com/zixia/bbs/discussions>
 
 ## Features
 
@@ -25,10 +25,10 @@ For any questions and support request, please go to our GitHub discussion at <ht
 > Learn how to build from `kbs_bbs` source for zixia bbs from the [Dockerfile](Dockerfile)
 
 ```sh
-git clone https://github.com/zixia/bbs.zixia.net.git
-cd bbs.zixia.net
+git clone https://github.com/zixia/bbs.git
+cd bbs
 
-docker build -t bbs.zixia.net .
+docker build -t bbs .
 ```
 
 ## Run
@@ -47,7 +47,7 @@ docker run \
   -e VIRTUAL_HOST=bbs.zixia.net,*.bbs.zixia.net,wforum.zixia.net,*.wforum.zixia.net \
   -e LETSENCRYPT_HOST=bbs.zixia.net,wforum.zixia.net \
   -e HTTPS_METHOD=noredirect \
-  ghcr.io/zixia/bbs.zixia.net
+  ghcr.io/zixia/bbs
 ```
 
 > Replace the above port(2222, 22222, 2323, 8080), volume(/data/bbs), and environment variables with your own value to fit your settings.
@@ -74,7 +74,7 @@ For example, the args `-v /data/bbs:/bbs` will mount the local `/data/bbs` folde
 The KBS sytem is using GBK for encoding so we need to use `luit` to convert GBK to UTF8
 
 ```sh
-luit -encoding GBK ssh zixia@bbs.zixia.net
+luit -encoding GBK ssh guest@bbs.zixia.net
 
 # or
 
@@ -117,7 +117,7 @@ The bbs.zixia.net is currently hosted on [Microsoft Azure Cloud](https://azure.c
 
 ### v21 Jan 25, 2021
 
-The <telnet://bbs.zixia.net> has been fully dockerized & cloudified on Azure Cloud!
+The `telnet://bbs.zixia.net` has been fully dockerized & cloudified on Azure Cloud!
 
 ### v20 Dec 30, 2020
 
diff --git a/kbs_bbs/site/zixia.h b/kbs_bbs/site/zixia.h
index bfa3766..b0d3ca4 100755
--- a/kbs_bbs/site/zixia.h
+++ b/kbs_bbs/site/zixia.h
@@ -82,7 +82,7 @@
 
 /**
  * Huan(202101): do not delete user when their life less than 0
- *  https://github.com/zixia/bbs.zixia.net/issues/3
+ *  https://github.com/zixia/bbs/issues/3
  */
 #define	SAVELIVE
 
diff --git a/root/entrypoint.sh b/root/entrypoint.sh
index 211493c..fdfbd1d 100755
--- a/root/entrypoint.sh
+++ b/root/entrypoint.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# https://github.com/zixia/bbs.zixia.net
+# https://github.com/zixia/bbs
 #
 # Author: Huan <zixia@zixia.net>
 # Date:   Jan 2021
diff --git a/root/etc/motd b/root/etc/motd
index 8dea207..ec33a2e 100644
--- a/root/etc/motd
+++ b/root/etc/motd
@@ -1,15 +1,17 @@
 ___________________________________________________________________
 
+
 Welcome to Zixia BBS Server!
 
 This system is run as a Docker container,
 you can learn it more from source code at
-https://github.com/zixia/bbs.zixia.net
+https://github.com/zixia/bbs
 
 Please feel free to post at
-https://github.com/zixia/bbs.zixia.net/discussions
+https://github.com/zixia/bbs/discussions
 if you have any qustions.
 
 Huan <zixia@zixia.net>
 Jan 5, 2021
+
 ___________________________________________________________________
diff --git a/root/etc/services.d/apache/run b/root/etc/services.d/apache/run
index a8d62e5..7d256e1 100755
--- a/root/etc/services.d/apache/run
+++ b/root/etc/services.d/apache/run
@@ -1,7 +1,7 @@
 #!/usr/bin/with-contenv bash
 #
 # Author: Huan <zixia@zixia.net>
-#   https://github.com/zixia/bbs.zixia.net
+#   https://github.com/zixia/bbs
 #   Jan 5, 2021
 #
 
diff --git a/scripts/run.sh b/scripts/run.sh
index 6f95bcb..51787d2 100755
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -3,7 +3,7 @@
 set -e
 set -o pipefail
 
-# https://github.com/zixia/bbs.zixia.net/issues/12
+# https://github.com/zixia/bbs/issues/12
 GDB_OPTIONS=\
   --cap-add=SYS_PTRACE \
   --security-opt apparmor=unconfined \
@@ -25,9 +25,9 @@ docker run \
   $GDB_OPTIONS \
   $PORT_OPTIONS \
   $ENV_OPTIONS \
-  --name bbs.zixia.net \
+  --name bbs \
   -v /data/bbs:/bbs \
-  ghcr.io/zixia/bbs.zixia.net
+  ghcr.io/zixia/bbs
   # --entrypoint bash \
   # bbs.zixia.net