diff --git a/make/common/templates/adminserver/env b/make/common/templates/adminserver/env
index 445813509..7e0a9e242 100644
--- a/make/common/templates/adminserver/env
+++ b/make/common/templates/adminserver/env
@@ -25,6 +25,7 @@ EMAIL_PWD=$email_pwd
 EMAIL_SSL=$email_ssl
 EMAIL_FROM=$email_from
 EMAIL_IDENTITY=$email_identity
+EMAIL_INSECURE=$email_insecure
 HARBOR_ADMIN_PASSWORD=$harbor_admin_password
 PROJECT_CREATION_RESTRICTION=$project_creation_restriction
 MAX_JOB_WORKERS=$max_job_workers
diff --git a/make/harbor.cfg b/make/harbor.cfg
index 4fea2b573..34af8b960 100644
--- a/make/harbor.cfg
+++ b/make/harbor.cfg
@@ -55,6 +55,7 @@ email_username = sample_admin@mydomain.com
 email_password = abc
 email_from = admin <sample_admin@mydomain.com>
 email_ssl = false
+email_insecure = false
 
 ##The initial password of Harbor admin, only works for the first time when Harbor starts. 
 #It has no effect after the first launch of Harbor.
@@ -101,10 +102,6 @@ token_expiration = 30
 #Set to "adminonly" so that only admin user can create project.
 project_creation_restriction = everyone
 
-#Determine whether the job service should verify the ssl cert when it connects to a remote registry.
-#Set this flag to off when the remote registry uses a self-signed or untrusted certificate.
-verify_remote_cert = on
-
 #The follow configurations are for Harbor HA mode only
 
 #the address of the mysql database.
diff --git a/make/prepare b/make/prepare
index cd40f01a7..3702bea46 100755
--- a/make/prepare
+++ b/make/prepare
@@ -119,6 +119,7 @@ email_usr = rcp.get("configuration", "email_username")
 email_pwd = rcp.get("configuration", "email_password")
 email_from = rcp.get("configuration", "email_from")
 email_ssl = rcp.get("configuration", "email_ssl")
+email_insecure = rcp.get("configuration", "email_insecure")
 harbor_admin_password = rcp.get("configuration", "harbor_admin_password")
 auth_mode = rcp.get("configuration", "auth_mode")
 ldap_url = rcp.get("configuration", "ldap_url")
@@ -234,6 +235,7 @@ render(os.path.join(templates_dir, "adminserver", "env"),
         email_usr=email_usr,
         email_pwd=email_pwd,
         email_ssl=email_ssl,
+        email_insecure=email_insecure,
         email_from=email_from,
         email_identity=email_identity,
         harbor_admin_password=harbor_admin_password,