diff --git a/.gitignore b/.gitignore
index d2308dedc..7df50e585 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,8 @@
 *.dll
 *.so
 *.dylib
-build/1panel
+build/1panel_agent
+build/1panel_core
 
 # Mac
 .DS_Store
diff --git a/Makefile b/Makefile
index 441f164d8..8bff5b613 100644
--- a/Makefile
+++ b/Makefile
@@ -7,10 +7,15 @@ GOOS=$(shell go env GOOS )
 BASE_PAH := $(shell pwd)
 BUILD_PATH = $(BASE_PAH)/build
 WEB_PATH=$(BASE_PAH)/frontend
-SERVER_PATH=$(BASE_PAH)/backend
-MAIN= $(BASE_PAH)/cmd/server/main.go
-APP_NAME=1panel
-ASSERT_PATH= $(BASE_PAH)/cmd/server/web/assets
+ASSERT_PATH= $(BASE_PAH)/core/cmd/server/web/assets
+
+CORE_MAIN= $(BASE_PAH)/cmd/server/main.go
+CORE_NAME=1panel_core
+
+AGENT_PATH=$(BASE_PAH)/agent
+AGENT_MAIN= $(AGENT_PATH)/cmd/server/main.go
+AGENT_NAME=1panel_agent
+
 
 clean_assets:
 	rm -rf $(ASSERT_PATH)
@@ -21,14 +26,20 @@ upx_bin:
 build_frontend:
 	cd $(WEB_PATH) && npm install && npm run build:pro
 
-build_backend_on_linux:
-	cd $(SERVER_PATH) \
-    && GOOS=$(GOOS) GOARCH=$(GOARCH) $(GOBUILD) -trimpath -ldflags '-s -w' -o $(BUILD_PATH)/$(APP_NAME) $(MAIN)
+build_core_on_linux:
+	GOOS=$(GOOS) GOARCH=$(GOARCH) $(GOBUILD) -trimpath -ldflags '-s -w' -o $(BUILD_PATH)/$(CORE_NAME) $(CORE_MAIN)
+
+build_agent_on_linux:
+	cd $(AGENT_PATH) \
+    && GOOS=$(GOOS) GOARCH=$(GOARCH) $(GOBUILD) -trimpath -ldflags '-s -w' -o $(BUILD_PATH)/$(AGENT_NAME) $(AGENT_MAIN)
+
+build_core_on_darwin:
+	GOOS=linux GOARCH=amd64 $(GOBUILD) -trimpath -ldflags '-s -w'  -o $(BUILD_PATH)/$(CORE_NAME) $(CORE_MAIN)
 
-build_backend_on_darwin:
-	cd $(SERVER_PATH) \
-    && GOOS=linux GOARCH=amd64 $(GOBUILD) -trimpath -ldflags '-s -w'  -o $(BUILD_PATH)/$(APP_NAME) $(MAIN)
+build_agent_on_darwin:
+	cd $(AGENT_PATH) \
+    && GOOS=linux GOARCH=amd64 $(GOBUILD) -trimpath -ldflags '-s -w'  -o $(BUILD_PATH)/$(AGENT_NAME) $(AGENT_MAIN)
 
-build_all: build_frontend build_backend_on_linux
+build_all: build_frontend build_core_on_linux build_agent_on_linux
 
-build_on_local: clean_assets build_frontend build_backend_on_darwin upx_bin
+build_on_local: clean_assets build_frontend build_core_on_darwin build_agent_on_darwin upx_bin
diff --git a/agent/cmd/server/conf/app.yaml b/agent/cmd/server/conf/app.yaml
index 0da0e5163..44efd5510 100644
--- a/agent/cmd/server/conf/app.yaml
+++ b/agent/cmd/server/conf/app.yaml
@@ -1,13 +1,9 @@
 system:
-  db_file: 1Panel.db
+  db_file: agent.db
   base_dir: /opt
   mode: dev
   repo_url: https://resource.fit2cloud.com/1panel/package
   app_repo: https://apps-assets.fit2cloud.com
-  is_demo: false
-  port: 9999
-  username: admin
-  password: admin123
 
 log:
   level: debug
diff --git a/agent/configs/system.go b/agent/configs/system.go
index d6e7c87c9..5aa9674a2 100644
--- a/agent/configs/system.go
+++ b/agent/configs/system.go
@@ -1,7 +1,7 @@
 package configs
 
 type System struct {
-	DbFile     string `mapstructure:"db_file"`
+	DbFile     string `mapstructure:"db_agent_file"`
 	DbPath     string `mapstructure:"db_path"`
 	LogPath    string `mapstructure:"log_path"`
 	DataDir    string `mapstructure:"data_dir"`
diff --git a/cmd/server/conf/app.yaml b/cmd/server/conf/app.yaml
index de1b82a88..3765fcae9 100644
--- a/cmd/server/conf/app.yaml
+++ b/cmd/server/conf/app.yaml
@@ -1,6 +1,5 @@
 system:
-  db_core_file: 1Panel_Core.db
-  db_file: 1Panel.db
+  db_core_file: core.db
   base_dir: /opt
   mode: dev
   repo_url: https://resource.fit2cloud.com/1panel/package