diff --git a/pkg/microservice/aslan/core/workflow/service/workflow/controller/job/job_build.go b/pkg/microservice/aslan/core/workflow/service/workflow/controller/job/job_build.go
index e8070f2f05..8cf0bca9d3 100644
--- a/pkg/microservice/aslan/core/workflow/service/workflow/controller/job/job_build.go
+++ b/pkg/microservice/aslan/core/workflow/service/workflow/controller/job/job_build.go
@@ -1178,8 +1178,12 @@ func getBuildJobVariables(build *commonmodels.ServiceAndBuild, taskID int64, pro
 
 	// repo envs
 	ret = append(ret, getReposVariables(build.Repos)...)
+
 	// build specific envs
-	ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_HOST", Value: registry.RegAddr, IsCredential: false})
+	registryHost := strings.TrimPrefix(registry.RegAddr, "http://")
+	registryHost = strings.TrimPrefix(registryHost, "https://")
+	ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_HOST", Value: registryHost, IsCredential: false})
+	ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_NAMESPACE", Value: registry.Namespace, IsCredential: false})
 	ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_AK", Value: registry.AccessKey, IsCredential: false})
 	ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_SK", Value: registry.SecretKey, IsCredential: true})
 
diff --git a/pkg/microservice/aslan/core/workflow/service/workflow/controller/job/job_vm_deploy.go b/pkg/microservice/aslan/core/workflow/service/workflow/controller/job/job_vm_deploy.go
index d517a6e449..a723e715e1 100644
--- a/pkg/microservice/aslan/core/workflow/service/workflow/controller/job/job_vm_deploy.go
+++ b/pkg/microservice/aslan/core/workflow/service/workflow/controller/job/job_vm_deploy.go
@@ -663,7 +663,10 @@ func getVMDeployJobVariables(vmDeploy *commonmodels.ServiceAndVMDeploy, buildInf
 	ret = append(ret, prepareDefaultWorkflowTaskEnvs(project, workflowName, workflowDisplayName, infrastructure, taskID)...)
 
 	// registry envs
-	ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_HOST", Value: registry.RegAddr, IsCredential: false})
+	registryHost := strings.TrimPrefix(registry.RegAddr, "http://")
+	registryHost = strings.TrimPrefix(registryHost, "https://")
+	ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_HOST", Value: registryHost, IsCredential: false})
+	ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_NAMESPACE", Value: registry.Namespace, IsCredential: false})
 	ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_AK", Value: registry.AccessKey, IsCredential: false})
 	ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_SK", Value: registry.SecretKey, IsCredential: true})