diff --git a/apps/port-forward-agent/1.3.7/Dockerfile b/apps/port-forward-agent/1.3.7/Dockerfile
deleted file mode 100644
index 3948bdc79..000000000
--- a/apps/port-forward-agent/1.3.7/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM debian:bullseye-slim
-
-RUN mkdir -p /app/pfg
-
-WORKDIR /app/pfg
-
-RUN apt-get update && apt-get upgrade -y && \
-    apt-get install -y wget unzip tzdata
-
-RUN wget -O pfg.zip https://gitee.com/tavenli/port-forward/releases/download/v1.3.7/forward-agent.linux64.v1.3.7.zip && \
-    unzip pfg.zip && \
-    chmod +x /app/pfg/forward-agent/forward-agent
-
-ENV TZ=Asia/Shanghai
-
-WORKDIR /app/pfg/forward-agent
-
-CMD ["./forward-agent"]
diff --git a/apps/port-forward-agent/data.yml b/apps/port-forward-agent/data.yml
deleted file mode 100644
index a8d9547de..000000000
--- a/apps/port-forward-agent/data.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Port-Forward-Agent
-tags:
-  - 工具
-title: Go 语言开发的端口转发工具 (客户端)
-description: Go 语言开发的端口转发工具 (客户端)
-additionalProperties:
-  key: port-forward-agent
-  name: Port-Forward-Agent
-  tags:
-    - Tool
-  shortDescZh: Go 语言开发的端口转发工具 (客户端)
-  shortDescEn: Port forwarding tool developed in Go (Agent)
-  type: tool
-  crossVersionUpdate: true
-  limit: 1
-  recommend: 0
-  website: https://gitee.com/tavenli/port-forward
-  github: https://gitee.com/tavenli/port-forward
-  document: https://gitee.com/tavenli/port-forward
diff --git a/apps/port-forward-server/1.3.7/Dockerfile b/apps/port-forward-server/1.3.7/Dockerfile
deleted file mode 100644
index b17c71f78..000000000
--- a/apps/port-forward-server/1.3.7/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM debian:bullseye-slim
-
-RUN mkdir -p /app/pfg
-
-WORKDIR /app/pfg
-
-RUN apt-get update && apt-get upgrade -y && \
-    apt-get install -y wget unzip tzdata
-
-RUN wget -O pfg.zip https://gitee.com/tavenli/port-forward/releases/download/v1.3.7/forward-server.linux64.v1.3.7.zip && \
-    unzip pfg.zip && \
-    chmod +x /app/pfg/forward-server/start.sh && \
-    chmod +x /app/pfg/forward-server/forward-server
-
-ENV TZ=Asia/Shanghai
-
-WORKDIR /app/pfg/forward-server
-
-CMD ["./forward-server"]
diff --git a/apps/port-forward-server/README.md b/apps/port-forward-server/README.md
deleted file mode 100644
index 514b3a87c..000000000
--- a/apps/port-forward-server/README.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# 使用说明
-- 控制台：http://IP:Port/login
-
-- 账户密码：
-```
-username：admin
-password：123456
-```
-
-# 原始相关
-
-# port-forward
-Go语言开发的端口转发工具  for port data forward
-
-官网地址：
-https://gitee.com/tavenli/port-forward
-
-```
-开发语言：GO
-控制台框架：beego
-数据库：sqlite3
-```
-
-# 最近更新
-```
-v1.3.6 发布，重新增加 TCP端口数据分发功能
-v1.3.5 发布，增加批量导入、批量添加规则
-v1.3.3 发布，增加 一键开启所有转发 和 一键关闭所有转发
-v1.3.2 发布，服务稳定性已经过长时间的验证
-v1.3.1 发布，增加程序启动自动开启转发
-v1.2.9_beta 发布，完善点对点转发的稳定性，支持TCP和UDP协议转发
-```
-
-# 最新编译好的版本下载：
-[https://gitee.com/tavenli/port-forward/releases](https://gitee.com/tavenli/port-forward/releases)
-
-
-
-# 功能介绍
-
-> 支持Web控制台添加端口映射
-
-> 支持对每条端口映射进行开启和关闭控制
-
-> 支持 RestfulAPI 接口，方便被其它系统集成
-
-> 支持每条端口转发的同时，再分发给多个端口，满足某些测试场景
-
-> 类似企业交换机的功能，即软交换机，主要是方便企业网络维护人员或开发人员
-
-
-# 使用交流群
-
-> 使用问题或个性化需求可加QQ号：17020415  （申请时请备注：端口转发）
-
-# 快速安装说明
-1. 下载编译好的程序包，并解压程序包
-2. 执行 start.sh （Linux）或 start.bat （Win）命令
-3. 打开浏览器，进入控制台，打开 http://127.0.0.1:8080/login
-4. 输入用户 admin  密码 123456 进入控制台
-
-
-# 控制台UI
-![登录](https://gitee.com/tavenli/port-forward/raw/master/screenshot/Login.png "在这里输入图片标题")
-
-
-![转发列表](https://gitee.com/tavenli/port-forward/raw/master/screenshot/List.png "在这里输入图片标题")
-
-
-![端口转发配置](https://gitee.com/tavenli/port-forward/raw/master/screenshot/edit.png "在这里输入图片标题")
-
-
-![方便与其它平台集成接口](https://gitee.com/tavenli/port-forward/raw/master/screenshot/ApiDoc.png "在这里输入图片标题")
-
diff --git a/apps/port-forward-server/logo.png b/apps/port-forward-server/logo.png
deleted file mode 100644
index 9cec3e62d..000000000
Binary files a/apps/port-forward-server/logo.png and /dev/null differ
diff --git a/apps/port-forward-agent/1.3.7/.env.sample b/apps/port-forward/1.3.7-agent/.env.sample
similarity index 100%
rename from apps/port-forward-agent/1.3.7/.env.sample
rename to apps/port-forward/1.3.7-agent/.env.sample
diff --git a/apps/port-forward-agent/1.3.7/data.yml b/apps/port-forward/1.3.7-agent/data.yml
similarity index 100%
rename from apps/port-forward-agent/1.3.7/data.yml
rename to apps/port-forward/1.3.7-agent/data.yml
diff --git a/apps/port-forward-agent/1.3.7/data/app.conf b/apps/port-forward/1.3.7-agent/data/app.conf
similarity index 100%
rename from apps/port-forward-agent/1.3.7/data/app.conf
rename to apps/port-forward/1.3.7-agent/data/app.conf
diff --git a/apps/port-forward-agent/1.3.7/docker-compose.yml b/apps/port-forward/1.3.7-agent/docker-compose.yml
similarity index 65%
rename from apps/port-forward-agent/1.3.7/docker-compose.yml
rename to apps/port-forward/1.3.7-agent/docker-compose.yml
index df80f102e..93ee2f158 100644
--- a/apps/port-forward-agent/1.3.7/docker-compose.yml
+++ b/apps/port-forward/1.3.7-agent/docker-compose.yml
@@ -1,10 +1,6 @@
 services:
-  port-forward-server:
-    build:
-      context: .
-      dockerfile: Dockerfile
-      args:
-        IMAGE_TAG: 1.3.7
+  port-forward-agent:
+    image: ghcr.io/pooneyy/port-forward:1.3.7-agent
     container_name: ${CONTAINER_NAME}
     restart: always
     network_mode: host
diff --git a/apps/port-forward-server/1.3.7/.env.sample b/apps/port-forward/1.3.7-server/.env.sample
similarity index 100%
rename from apps/port-forward-server/1.3.7/.env.sample
rename to apps/port-forward/1.3.7-server/.env.sample
diff --git a/apps/port-forward-server/1.3.7/data.yml b/apps/port-forward/1.3.7-server/data.yml
similarity index 100%
rename from apps/port-forward-server/1.3.7/data.yml
rename to apps/port-forward/1.3.7-server/data.yml
diff --git a/apps/port-forward-server/1.3.7/data/conf/app.conf b/apps/port-forward/1.3.7-server/data/conf/app.conf
similarity index 94%
rename from apps/port-forward-server/1.3.7/data/conf/app.conf
rename to apps/port-forward/1.3.7-server/data/conf/app.conf
index 5b522a32a..1ab1525c6 100644
--- a/apps/port-forward-server/1.3.7/data/conf/app.conf
+++ b/apps/port-forward/1.3.7-server/data/conf/app.conf
@@ -1,20 +1,20 @@
-
-app.name = "PortForward"
-app.cname = "端口转发系统"
-servername = "PortForward-Server"
-runmode ="dev"
-#runmode ="prod"
-viewspath = "views"
-#logfile.config = "close"
-
-[dev]
-httpaddr = "0.0.0.0"
-httpport = 8080
-recoverpanic = false
-[prod]
-httpaddr = "0.0.0.0"
-httpport = 8080
-recoverpanic = true
-graceful = true
-
-include "data.conf"
+
+app.name = "PortForward"
+app.cname = "端口转发系统"
+servername = "PortForward-Server"
+runmode ="dev"
+#runmode ="prod"
+viewspath = "views"
+#logfile.config = "close"
+
+[dev]
+httpaddr = "0.0.0.0"
+httpport = 8080
+recoverpanic = false
+[prod]
+httpaddr = "0.0.0.0"
+httpport = 8080
+recoverpanic = true
+graceful = true
+
+include "data.conf"
diff --git a/apps/port-forward-server/1.3.7/data/conf/data.conf b/apps/port-forward/1.3.7-server/data/conf/data.conf
similarity index 96%
rename from apps/port-forward-server/1.3.7/data/conf/data.conf
rename to apps/port-forward/1.3.7-server/data/conf/data.conf
index d75da4241..604e12853 100644
--- a/apps/port-forward-server/1.3.7/data/conf/data.conf
+++ b/apps/port-forward/1.3.7-server/data/conf/data.conf
@@ -1,6 +1,6 @@
-magic.service = ":7000"
-api.auth = "26CCD056107481F45D1AC805A24A9E59"
-
-agent.auth = "722ED8F8D9900CC1AB17243DC7B51A2D"
-
+magic.service = ":7000"
+api.auth = "26CCD056107481F45D1AC805A24A9E59"
+
+agent.auth = "722ED8F8D9900CC1AB17243DC7B51A2D"
+
 onstart.forward = "false"
\ No newline at end of file
diff --git a/apps/port-forward-server/1.3.7/data/data/data.db b/apps/port-forward/1.3.7-server/data/data/data.db
similarity index 100%
rename from apps/port-forward-server/1.3.7/data/data/data.db
rename to apps/port-forward/1.3.7-server/data/data/data.db
diff --git a/apps/port-forward-server/1.3.7/docker-compose.yml b/apps/port-forward/1.3.7-server/docker-compose.yml
similarity index 76%
rename from apps/port-forward-server/1.3.7/docker-compose.yml
rename to apps/port-forward/1.3.7-server/docker-compose.yml
index acf105bce..7eb31b6dc 100644
--- a/apps/port-forward-server/1.3.7/docker-compose.yml
+++ b/apps/port-forward/1.3.7-server/docker-compose.yml
@@ -1,10 +1,6 @@
 services:
   port-forward-server:
-    build:
-      context: .
-      dockerfile: Dockerfile
-      args:
-        IMAGE_TAG: 1.3.7
+    image: ghcr.io/pooneyy/port-forward:1.3.7-server
     container_name: ${CONTAINER_NAME}
     restart: always
     network_mode: host
diff --git a/apps/port-forward/Dockerfile b/apps/port-forward/Dockerfile
new file mode 100644
index 000000000..31b5b2b47
--- /dev/null
+++ b/apps/port-forward/Dockerfile
@@ -0,0 +1,25 @@
+FROM debian:bullseye-slim AS base
+ENV TZ=Asia/Shanghai
+RUN mkdir -p /app/pfg && \
+    apt-get update && apt-get upgrade -y && \
+    apt-get install -y wget unzip tzdata && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+WORKDIR /app/pfg
+
+FROM base AS agent
+RUN wget -O pfg.zip https://gitee.com/tavenli/port-forward/releases/download/v1.3.7/forward-agent.linux64.v1.3.7.zip && \
+    unzip pfg.zip && \
+    rm -rf pfg.zip && \
+    chmod +x /app/pfg/forward-agent/forward-agent
+WORKDIR /app/pfg/forward-agent
+CMD ["./forward-agent"]
+
+FROM base AS server
+RUN wget -O pfg.zip https://gitee.com/tavenli/port-forward/releases/download/v1.3.7/forward-server.linux64.v1.3.7.zip && \
+    unzip pfg.zip && \
+    rm -rf pfg.zip && \
+    chmod +x /app/pfg/forward-server/start.sh && \
+    chmod +x /app/pfg/forward-server/forward-server
+WORKDIR /app/pfg/forward-server
+CMD ["./forward-server"]
diff --git a/apps/port-forward-agent/README.md b/apps/port-forward/README.md
similarity index 100%
rename from apps/port-forward-agent/README.md
rename to apps/port-forward/README.md
diff --git a/apps/port-forward-server/data.yml b/apps/port-forward/data.yml
similarity index 69%
rename from apps/port-forward-server/data.yml
rename to apps/port-forward/data.yml
index 0b0a019d1..48fcd433f 100644
--- a/apps/port-forward-server/data.yml
+++ b/apps/port-forward/data.yml
@@ -1,14 +1,14 @@
 name: Port-Forward-Server
 tags:
   - 工具
-title: Go 语言开发的端口转发工具 (服务端)
-description: Go 语言开发的端口转发工具 (服务端)
+title: Go 语言开发的端口转发工具
+description: Go 语言开发的端口转发工具
 additionalProperties:
   key: port-forward-server
   name: Port-Forward-Server
   tags:
     - Tool
-  shortDescZh: Go 语言开发的端口转发工具 (服务端)
+  shortDescZh: Go 语言开发的端口转发工具
   shortDescEn: Port forwarding tool developed in Go (Server)
   type: tool
   crossVersionUpdate: true
diff --git a/apps/port-forward-agent/logo.png b/apps/port-forward/logo.png
similarity index 100%
rename from apps/port-forward-agent/logo.png
rename to apps/port-forward/logo.png