diff --git a/agent/app/service/runtime.go b/agent/app/service/runtime.go
index 40e331b80..f71523899 100644
--- a/agent/app/service/runtime.go
+++ b/agent/app/service/runtime.go
@@ -518,6 +518,7 @@ func (r *RuntimeService) Update(req request.RuntimeUpdate) error {
 		runtime.CodeDir = req.CodeDir
 		runtime.Port = strings.Join(hostPorts, ",")
 		runtime.Status = constant.StatusReCreating
+		runtime.ContainerName = req.Params["CONTAINER_NAME"].(string)
 		_ = runtimeRepo.Save(runtime)
 		go reCreateRuntime(runtime)
 	}
diff --git a/agent/app/service/website.go b/agent/app/service/website.go
index 8b5f5df18..a928b4f3c 100644
--- a/agent/app/service/website.go
+++ b/agent/app/service/website.go
@@ -259,7 +259,7 @@ func (w WebsiteService) CreateWebsite(create request.WebsiteCreate) (err error)
 		primaryDomain = fmt.Sprintf("%s:%v", domains[0].Domain, domains[0].Port)
 	}
 
-	defaultDate, _ := time.Parse(constant.DateLayout, constant.DefaultDate)
+	defaultDate, _ := time.Parse(constant.DateLayout, constant.WebsiteDefaultExpireDate)
 	website := &model.Website{
 		PrimaryDomain:  primaryDomain,
 		Type:           create.Type,
diff --git a/agent/constant/common.go b/agent/constant/common.go
index a8c371bf8..aec525f66 100644
--- a/agent/constant/common.go
+++ b/agent/constant/common.go
@@ -23,10 +23,11 @@ const (
 	TimeOut20s = 20
 	TimeOut5m  = 300
 
-	DateLayout         = "2006-01-02" // or use time.DateOnly while go version >= 1.20
-	DefaultDate        = "1970-01-01"
-	DateTimeLayout     = "2006-01-02 15:04:05" // or use time.DateTime while go version >= 1.20
-	DateTimeSlimLayout = "20060102150405"
+	DateLayout               = "2006-01-02" // or use time.DateOnly while go version >= 1.20
+	DefaultDate              = "1970-01-01"
+	DateTimeLayout           = "2006-01-02 15:04:05" // or use time.DateTime while go version >= 1.20
+	DateTimeSlimLayout       = "20060102150405"
+	WebsiteDefaultExpireDate = "9999-12-31"
 )
 
 const (
diff --git a/agent/init/migration/migrate.go b/agent/init/migration/migrate.go
index ea31e1dfa..4484b5850 100644
--- a/agent/init/migration/migrate.go
+++ b/agent/init/migration/migrate.go
@@ -27,6 +27,7 @@ func InitAgentDB() {
 		migrations.AddOllamaModel,
 		migrations.UpdateSettingStatus,
 		migrations.InitDefault,
+		migrations.UpdateWebsiteExpireDate,
 	})
 	if err := m.Migrate(); err != nil {
 		global.LOG.Error(err)
diff --git a/agent/init/migration/migrations/init.go b/agent/init/migration/migrations/init.go
index 2a2fd8490..b46242d43 100644
--- a/agent/init/migration/migrations/init.go
+++ b/agent/init/migration/migrations/init.go
@@ -3,6 +3,7 @@ package migrations
 import (
 	"fmt"
 	"path"
+	"time"
 
 	"github.com/1Panel-dev/1Panel/agent/app/dto/request"
 	"github.com/1Panel-dev/1Panel/agent/app/model"
@@ -296,3 +297,17 @@ var InitDefault = &gormigrate.Migration{
 		return nil
 	},
 }
+
+var UpdateWebsiteExpireDate = &gormigrate.Migration{
+	ID: "20250304-update-website",
+	Migrate: func(tx *gorm.DB) error {
+		targetDate := time.Date(9999, 12, 31, 0, 0, 0, 0, time.UTC)
+
+		if err := tx.Model(&model.Website{}).
+			Where("expire_date = ?", time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC)).
+			Update("expire_date", targetDate).Error; err != nil {
+			return err
+		}
+		return nil
+	},
+}
diff --git a/frontend/src/views/website/website/index.vue b/frontend/src/views/website/website/index.vue
index b18ea804c..e5210212c 100644
--- a/frontend/src/views/website/website/index.vue
+++ b/frontend/src/views/website/website/index.vue
@@ -272,7 +272,7 @@ const shortcuts = [
     {
         text: useI18n().t('website.ever'),
         value: () => {
-            return new Date('1970-01-01');
+            return new Date('9999-12-31');
         },
     },
     {
@@ -379,7 +379,7 @@ const openConfig = (id: number) => {
 
 const isEver = (time: string) => {
     const expireDate = new Date(time);
-    return expireDate < new Date('1970-01-02');
+    return expireDate > new Date('9999-12-30');
 };
 
 const isBeforeNow = (time: string) => {
@@ -415,10 +415,14 @@ const setdateRefs = (ref: any) => {
 };
 
 const initDatePicker = (row: any) => {
-    if (dataRef.value == undefined && row.oldExpireDate == undefined && isBeforeNow(row.expireDate)) {
+    if (
+        (dataRef.value == undefined && row.oldExpireDate == undefined && isBeforeNow(row.expireDate)) ||
+        isEver(row.expireDate)
+    ) {
         row.oldExpireDate = row.expireDate;
         const date = new Date().toLocaleDateString();
         row.expireDate = date;
+        return;
     }
 };