diff --git a/core/src/main/java/com/flowci/core/Application.java b/core/src/main/java/com/flowci/core/Application.java
index 0aa5f67e2..dcd6b330f 100644
--- a/core/src/main/java/com/flowci/core/Application.java
+++ b/core/src/main/java/com/flowci/core/Application.java
@@ -16,15 +16,34 @@
 
 package com.flowci.core;
 
+import com.flowci.util.StringHelper;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
+
+import java.io.IOException;
 
 /**
  * @author yang
  */
+@Log4j2
 @SpringBootApplication
 public class Application {
 
+    @Autowired
+    private ResourceLoader resourceLoader;
+
+    @EventListener(ContextRefreshedEvent.class)
+    public void printBanner() throws IOException {
+        Resource r = resourceLoader.getResource("classpath:welcome.txt");
+        log.info(StringHelper.toString(r.getInputStream()));
+    }
+
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
     }
diff --git a/core/src/main/java/com/flowci/core/agent/domain/ShellIn.java b/core/src/main/java/com/flowci/core/agent/domain/ShellIn.java
index d1b8bcfed..3be9a1f13 100644
--- a/core/src/main/java/com/flowci/core/agent/domain/ShellIn.java
+++ b/core/src/main/java/com/flowci/core/agent/domain/ShellIn.java
@@ -52,6 +52,8 @@ public enum ShellType {
 
     private Set<String> secrets;
 
+    private Set<String> configs;
+
     public ShellIn() {
         super(Type.SHELL);
     }
diff --git a/core/src/main/java/com/flowci/core/agent/service/AgentHostServiceImpl.java b/core/src/main/java/com/flowci/core/agent/service/AgentHostServiceImpl.java
index 488bfe9f7..a5344ab69 100644
--- a/core/src/main/java/com/flowci/core/agent/service/AgentHostServiceImpl.java
+++ b/core/src/main/java/com/flowci/core/agent/service/AgentHostServiceImpl.java
@@ -47,7 +47,6 @@
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.event.EventListener;
 import org.springframework.core.env.Environment;
 import org.springframework.core.task.TaskExecutor;
@@ -56,6 +55,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import javax.annotation.PostConstruct;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.*;
@@ -114,6 +114,12 @@ public class AgentHostServiceImpl implements AgentHostService {
         mapping.put(K8sAgentHost.class, new K8sHostAdaptor());
     }
 
+    @PostConstruct
+    public void init() {
+        autoCreateLocalAgentHost();
+        syncAgents();
+    }
+
     //====================================================================
     //        %% Public functions
     //====================================================================
@@ -378,12 +384,6 @@ public void scheduleCollect() {
     //        %% Internal events
     //====================================================================
 
-    @EventListener
-    public void onContextReady(ContextRefreshedEvent event) {
-        autoCreateLocalAgentHost();
-        syncAgents();
-    }
-
     @EventListener
     public void onNoIdleAgent(NoIdleAgentEvent event) {
         Set<String> agentTags = event.getSelector().getLabel();
diff --git a/core/src/main/java/com/flowci/core/agent/service/AgentServiceImpl.java b/core/src/main/java/com/flowci/core/agent/service/AgentServiceImpl.java
index 5479fc4cf..d004f12f2 100644
--- a/core/src/main/java/com/flowci/core/agent/service/AgentServiceImpl.java
+++ b/core/src/main/java/com/flowci/core/agent/service/AgentServiceImpl.java
@@ -42,11 +42,11 @@
 import com.google.common.collect.Sets;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.event.EventListener;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.PostConstruct;
 import java.io.IOException;
 import java.time.Instant;
 import java.util.*;
@@ -108,7 +108,7 @@ public class AgentServiceImpl implements AgentService {
     @Autowired
     private SocketPushManager socketPushManager;
 
-    @EventListener(ContextRefreshedEvent.class)
+    @PostConstruct
     public void initAgentStatus() {
         taskManager.run("init-agent-status", true, () -> {
             for (Agent agent : agentDao.findAll()) {
@@ -122,7 +122,7 @@ public void initAgentStatus() {
         });
     }
 
-    @EventListener(ContextRefreshedEvent.class)
+    @PostConstruct
     public void subscribeIdleAgentQueue() throws IOException {
         idleAgentQueueManager.startConsumer(idleAgentQueue, false, (header, body, envelope) -> {
             String agentId = new String(body);
@@ -152,6 +152,22 @@ public void subscribeIdleAgentQueue() throws IOException {
         }, null);
     }
 
+    @PostConstruct
+    public void lockNodeCleanup() {
+        List<String> children = zk.children(zkProperties.getAgentRoot());
+        for (String path : children) {
+            String agentId = Util.getAgentIdFromLockPath(path);
+            Optional<Agent> optional = agentDao.findById(agentId);
+
+            if (!optional.isPresent()) {
+                try {
+                    zk.delete(path, true);
+                } catch (Throwable ignore) {
+                }
+            }
+        }
+    }
+
     //====================================================================
     //        %% Public Methods
     //====================================================================
@@ -369,22 +385,6 @@ public void dispatch(CmdIn cmd, Agent agent) {
     //        %% Spring Event Listener
     //====================================================================
 
-    @EventListener(ContextRefreshedEvent.class)
-    public void lockNodeCleanup() {
-        List<String> children = zk.children(zkProperties.getAgentRoot());
-        for (String path : children) {
-            String agentId = Util.getAgentIdFromLockPath(path);
-            Optional<Agent> optional = agentDao.findById(agentId);
-
-            if (!optional.isPresent()) {
-                try {
-                    zk.delete(path, true);
-                } catch (Throwable ignore) {
-                }
-            }
-        }
-    }
-
     @EventListener
     public void onConnected(OnConnectedEvent event) {
         Optional<InterLock> lock = lock();
diff --git a/core/src/main/java/com/flowci/core/api/OpenRestController.java b/core/src/main/java/com/flowci/core/api/OpenRestController.java
index 0ebddbc7e..d3cea5d80 100644
--- a/core/src/main/java/com/flowci/core/api/OpenRestController.java
+++ b/core/src/main/java/com/flowci/core/api/OpenRestController.java
@@ -73,7 +73,7 @@ public Secret getSecret(@PathVariable String name) {
 
         if (secret instanceof RSASecret) {
             RSASecret rsa = (RSASecret) secret;
-            rsa.setPublicKey(null);
+            rsa.setPrivateKey(null);
         }
 
         return secret;
diff --git a/core/src/main/java/com/flowci/core/common/config/AppProperties.java b/core/src/main/java/com/flowci/core/common/config/AppProperties.java
index 49a2b3da5..e3479ddbe 100644
--- a/core/src/main/java/com/flowci/core/common/config/AppProperties.java
+++ b/core/src/main/java/com/flowci/core/common/config/AppProperties.java
@@ -23,6 +23,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.io.Resource;
 import org.springframework.validation.annotation.Validated;
 
 import javax.validation.constraints.NotBlank;
@@ -51,6 +52,9 @@ public class AppProperties {
     @Length(max = 16, min = 16)
     private String secret;
 
+    // indicate load yaml template and plugin from where
+    private String resourceDomain;
+
     private boolean autoLocalAgentHost;
 
     private boolean defaultSmtpConfig;
@@ -106,7 +110,7 @@ public Minio minio() {
     @Data
     public static class Flow {
 
-        private String templatesUrl;
+        private Resource templatesUrl;
     }
 
     @Data
@@ -118,7 +122,7 @@ public static class Job {
     @Data
     public static class Plugin {
 
-        private String defaultRepo;
+        private Resource defaultRepo;
 
         private Boolean autoUpdate;
     }
diff --git a/core/src/main/java/com/flowci/core/common/domain/Settings.java b/core/src/main/java/com/flowci/core/common/domain/Settings.java
index a51a51abb..964fcf789 100644
--- a/core/src/main/java/com/flowci/core/common/domain/Settings.java
+++ b/core/src/main/java/com/flowci/core/common/domain/Settings.java
@@ -32,6 +32,11 @@ public static class Action {
 
     private String serverUrl;
 
+    /**
+     * Indicate load resource(cn) from where
+     */
+    private String source;
+
     public Settings() {
         setId(DefaultId);
     }
diff --git a/core/src/main/java/com/flowci/core/common/domain/SourceWithDomain.java b/core/src/main/java/com/flowci/core/common/domain/SourceWithDomain.java
new file mode 100644
index 000000000..dc3431a26
--- /dev/null
+++ b/core/src/main/java/com/flowci/core/common/domain/SourceWithDomain.java
@@ -0,0 +1,28 @@
+package com.flowci.core.common.domain;
+
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.flowci.util.StringHelper;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+@Getter
+@Setter
+public abstract class SourceWithDomain implements Serializable {
+
+    private static final String DOMAIN_CN = "cn";
+
+    @JsonAlias("url")
+    private String source;
+
+    @JsonAlias("url_cn")
+    @JsonProperty("source_cn")
+    private String sourceCn;
+
+    public String getSourceWithDomain(String domain) {
+        if (!StringHelper.hasValue(domain)) return source;
+        return DOMAIN_CN.equalsIgnoreCase(domain) ? sourceCn : source;
+    }
+}
diff --git a/core/src/main/java/com/flowci/core/common/domain/Variables.java b/core/src/main/java/com/flowci/core/common/domain/Variables.java
index a63d7f466..bd143343a 100644
--- a/core/src/main/java/com/flowci/core/common/domain/Variables.java
+++ b/core/src/main/java/com/flowci/core/common/domain/Variables.java
@@ -29,6 +29,7 @@ public abstract static class App {
 
         public static final String Host = "FLOWCI_SERVER_HOST";
 
+        public static final String ResourceDomain = "FLOWCI_RESOURCE_DOMAIN";
     }
 
     public abstract static class Flow {
diff --git a/core/src/main/java/com/flowci/core/common/manager/SocketPushManager.java b/core/src/main/java/com/flowci/core/common/manager/SocketPushManager.java
index 9db327519..bca7498b9 100644
--- a/core/src/main/java/com/flowci/core/common/manager/SocketPushManager.java
+++ b/core/src/main/java/com/flowci/core/common/manager/SocketPushManager.java
@@ -23,11 +23,10 @@
 import com.flowci.core.common.rabbit.RabbitOperations;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.event.ContextRefreshedEvent;
-import org.springframework.context.event.EventListener;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.PostConstruct;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
@@ -56,7 +55,7 @@ public class SocketPushManager {
     @Autowired
     private RabbitOperations broadcastQueueManager;
 
-    @EventListener(ContextRefreshedEvent.class)
+    @PostConstruct
     public void subscribeBroadcastQueue() throws IOException {
         broadcastQueueManager.startConsumer(wsBroadcastQueue, true, (headers, body, envelope) -> {
             try {
diff --git a/core/src/main/java/com/flowci/core/common/manager/SpringEventManagerImpl.java b/core/src/main/java/com/flowci/core/common/manager/SpringEventManagerImpl.java
index cd7391831..135e904d5 100644
--- a/core/src/main/java/com/flowci/core/common/manager/SpringEventManagerImpl.java
+++ b/core/src/main/java/com/flowci/core/common/manager/SpringEventManagerImpl.java
@@ -27,10 +27,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.context.event.ContextRefreshedEvent;
-import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.PostConstruct;
 import java.io.IOException;
 import java.util.Map;
 
@@ -55,7 +54,7 @@ public class SpringEventManagerImpl implements SpringEventManager {
     @Autowired
     private RabbitOperations broadcastQueueManager;
 
-    @EventListener(ContextRefreshedEvent.class)
+    @PostConstruct
     public void subscribeBroadcastQueue() throws IOException {
         broadcastQueueManager.startConsumer(eventBroadcastQueue, true, (headers, body, envelope) -> {
             try {
diff --git a/core/src/main/java/com/flowci/core/common/service/SettingServiceImpl.java b/core/src/main/java/com/flowci/core/common/service/SettingServiceImpl.java
index a7ed7c939..e3ff3adca 100644
--- a/core/src/main/java/com/flowci/core/common/service/SettingServiceImpl.java
+++ b/core/src/main/java/com/flowci/core/common/service/SettingServiceImpl.java
@@ -1,5 +1,6 @@
 package com.flowci.core.common.service;
 
+import com.flowci.core.common.config.AppProperties;
 import com.flowci.core.common.dao.SettingsDao;
 import com.flowci.core.common.domain.Settings;
 import com.flowci.core.common.domain.Variables;
@@ -18,6 +19,9 @@ public class SettingServiceImpl implements SettingService {
     @Autowired
     private Environment environment;
 
+    @Autowired
+    private AppProperties appProperties;
+
     @Autowired
     private ServerProperties serverProperties;
 
@@ -49,6 +53,7 @@ public void setDefaultValue() {
             }
 
             s.setServerUrl(serverUrl);
+            s.setSource(appProperties.getResourceDomain());
             settingsDao.save(s);
         });
     }
diff --git a/core/src/main/java/com/flowci/core/config/service/ConfigServiceImpl.java b/core/src/main/java/com/flowci/core/config/service/ConfigServiceImpl.java
index dbfc98d3a..792d175c5 100644
--- a/core/src/main/java/com/flowci/core/config/service/ConfigServiceImpl.java
+++ b/core/src/main/java/com/flowci/core/config/service/ConfigServiceImpl.java
@@ -16,12 +16,12 @@
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.event.EventListener;
 import org.springframework.core.io.Resource;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.PostConstruct;
 import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
@@ -42,8 +42,8 @@ public class ConfigServiceImpl implements ConfigService {
     @Autowired
     private SpringEventManager eventManager;
 
-    @EventListener
-    public void onInit(ContextRefreshedEvent ignore) {
+    @PostConstruct
+    public void onInit() {
         try {
             Config config = ConfigParser.parse(defaultSmtpConfigYml.getInputStream());
             Optional<Config> optional = configDao.findByName(config.getName());
diff --git a/core/src/main/java/com/flowci/core/flow/config/FlowConfig.java b/core/src/main/java/com/flowci/core/flow/config/FlowConfig.java
index cf7fac04c..0d44c88d5 100644
--- a/core/src/main/java/com/flowci/core/flow/config/FlowConfig.java
+++ b/core/src/main/java/com/flowci/core/flow/config/FlowConfig.java
@@ -20,7 +20,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.flowci.core.common.config.AppProperties;
 import com.flowci.core.common.helper.CacheHelper;
-import com.flowci.core.common.manager.HttpRequestManager;
 import com.flowci.core.flow.domain.Template;
 import com.flowci.tree.NodeTree;
 import com.github.benmanes.caffeine.cache.Cache;
@@ -28,6 +27,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.Resource;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.concurrent.ConcurrentTaskScheduler;
 
@@ -58,13 +58,13 @@ public Cache<String, List<String>> gitBranchCache() {
     }
 
     @Bean("templates")
-    public List<Template> getTemplates(HttpRequestManager httpManager) throws IOException {
-        String body = httpManager.get(flowProperties.getTemplatesUrl());
+    public List<Template> getTemplates() throws IOException {
+        Resource r = flowProperties.getTemplatesUrl();
 
         TypeReference<List<Template>> typeRef = new TypeReference<List<Template>>() {
         };
 
-        List<Template> list = objectMapper.readValue(body, typeRef);
+        List<Template> list = objectMapper.readValue(r.getInputStream(), typeRef);
         log.info("Templates is loaded from {}", flowProperties.getTemplatesUrl());
         return list;
     }
diff --git a/core/src/main/java/com/flowci/core/flow/controller/YmlController.java b/core/src/main/java/com/flowci/core/flow/controller/YmlController.java
index ea6da2ef6..dfd533125 100644
--- a/core/src/main/java/com/flowci/core/flow/controller/YmlController.java
+++ b/core/src/main/java/com/flowci/core/flow/controller/YmlController.java
@@ -62,14 +62,13 @@ public void saveYml(@PathVariable String flowName,
                         @RequestBody RequestMessage<String> body) {
         Flow flow = flowService.get(flowName);
         String yamlInB64 = body.getData();
-        ymlService.saveYml(flow, ymlName, yamlInB64);
+        ymlService.saveYmlFromB64(flow, ymlName, yamlInB64);
     }
 
     @GetMapping(value = "/{flowName}/yml/{ymlName}", produces = MediaType.APPLICATION_JSON_VALUE)
     @Action(FlowAction.GET_YML)
     public String getYml(@PathVariable String flowName, @PathVariable String ymlName) {
         Flow flow = flowService.get(flowName);
-        String yamlInB64 = ymlService.getYmlString(flow.getId(), ymlName);
-        return yamlInB64;
+        return ymlService.getYmlString(flow.getId(), ymlName);
     }
 }
diff --git a/core/src/main/java/com/flowci/core/flow/domain/ConfirmOption.java b/core/src/main/java/com/flowci/core/flow/domain/ConfirmOption.java
index c7591ae2c..3be15b97c 100644
--- a/core/src/main/java/com/flowci/core/flow/domain/ConfirmOption.java
+++ b/core/src/main/java/com/flowci/core/flow/domain/ConfirmOption.java
@@ -16,6 +16,7 @@
 
 package com.flowci.core.flow.domain;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.flowci.util.StringHelper;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -27,6 +28,8 @@
 @Accessors(chain = true)
 public class ConfirmOption {
 
+    private static final String DESC_BLANK = "blank";
+
     private String gitUrl;
 
     private String secret;
@@ -36,6 +39,12 @@ public class ConfirmOption {
      */
     private String yaml = StringHelper.EMPTY;
 
+    /**
+     * Template name (desc), yaml property will be ignored if it is defined
+     */
+    @JsonProperty("desc")
+    private String templateDesc;
+
     public boolean hasGitUrl() {
         return StringHelper.hasValue(gitUrl);
     }
@@ -47,4 +56,12 @@ public boolean hasSecret() {
     public boolean hasYml() {
         return StringHelper.hasValue(yaml);
     }
+
+    public boolean hasTemplateDesc() {
+        return StringHelper.hasValue(templateDesc);
+    }
+
+    public boolean hasBlankTemplate() {
+        return DESC_BLANK.equalsIgnoreCase(templateDesc);
+    }
 }
diff --git a/core/src/main/java/com/flowci/core/flow/domain/Template.java b/core/src/main/java/com/flowci/core/flow/domain/Template.java
index b9670e9fc..bb9afcecf 100644
--- a/core/src/main/java/com/flowci/core/flow/domain/Template.java
+++ b/core/src/main/java/com/flowci/core/flow/domain/Template.java
@@ -1,13 +1,12 @@
 package com.flowci.core.flow.domain;
 
+import com.flowci.core.common.domain.SourceWithDomain;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public final class Template {
-
-    private String url;
+public final class Template extends SourceWithDomain {
 
     private String desc;
 
diff --git a/core/src/main/java/com/flowci/core/flow/service/FlowServiceImpl.java b/core/src/main/java/com/flowci/core/flow/service/FlowServiceImpl.java
index 546f23f03..1c419560f 100644
--- a/core/src/main/java/com/flowci/core/flow/service/FlowServiceImpl.java
+++ b/core/src/main/java/com/flowci/core/flow/service/FlowServiceImpl.java
@@ -16,16 +16,15 @@
 
 package com.flowci.core.flow.service;
 
+import com.flowci.core.common.config.AppProperties;
 import com.flowci.core.common.domain.Variables;
+import com.flowci.core.common.manager.HttpRequestManager;
 import com.flowci.core.common.manager.SessionManager;
 import com.flowci.core.common.manager.SpringEventManager;
 import com.flowci.core.flow.dao.FlowDao;
 import com.flowci.core.flow.dao.FlowUserDao;
-import com.flowci.core.flow.domain.ConfirmOption;
-import com.flowci.core.flow.domain.Flow;
+import com.flowci.core.flow.domain.*;
 import com.flowci.core.flow.domain.Flow.Status;
-import com.flowci.core.flow.domain.WebhookStatus;
-import com.flowci.core.flow.domain.Yml;
 import com.flowci.core.flow.event.FlowCreatedEvent;
 import com.flowci.core.flow.event.FlowDeletedEvent;
 import com.flowci.core.flow.event.FlowInitEvent;
@@ -49,11 +48,11 @@
 import com.google.common.collect.Sets;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.event.EventListener;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.PostConstruct;
 import java.io.IOException;
 import java.util.*;
 
@@ -79,22 +78,33 @@ public class FlowServiceImpl implements FlowService {
     @Autowired
     private FileManager fileManager;
 
+    @Autowired
+    private HttpRequestManager httpRequestManager;
+
     @Autowired
     private YmlService ymlService;
 
     @Autowired
     private CronService cronService;
 
+    @Autowired
+    private List<Template> templates;
+
+    @Autowired
+    private AppProperties appProperties;
+
+    @PostConstruct
+    public void initJobQueueForFlow() {
+        List<Flow> all = flowDao.findAll();
+        eventManager.publish(new FlowInitEvent(this, all));
+    }
+
     // ====================================================================
     // %% Public function
     // ====================================================================
 
     @Override
     public List<Flow> list(Status status) {
-        if (sessionManager.get().isAdmin()) {
-            return flowDao.findAll();
-        }
-
         String email = sessionManager.getUserEmail();
         List<String> flowIds = flowUserDao.findAllFlowsByUserEmail(email);
 
@@ -197,9 +207,24 @@ public Flow confirm(String name, ConfirmOption option) {
 
         flow.setStatus(Status.CONFIRMED);
 
+        if (option.hasBlankTemplate()) {
+            return flowDao.save(flow);
+        }
+
+        // load YAML from template
+        if (option.hasTemplateDesc()) {
+            try {
+                String template = loadYmlFromTemplate(option.getTemplateDesc());
+                ymlService.saveYml(flow, Yml.DEFAULT_NAME, template);
+                return flow;
+            } catch (IOException e) {
+                throw new NotFoundException("Unable to load template {0} content", option.getTemplateDesc());
+            }
+        }
+
         // flow instance will be saved in saveYml
         if (option.hasYml()) {
-            ymlService.saveYml(flow, Yml.DEFAULT_NAME, option.getYaml());
+            ymlService.saveYmlFromB64(flow, Yml.DEFAULT_NAME, option.getYaml());
             return flow;
         }
 
@@ -290,12 +315,6 @@ public void removeUsers(Flow flow, String... emails) {
     // %% Internal events
     // ====================================================================
 
-    @EventListener
-    public void initJobQueueForFlow(ContextRefreshedEvent ignore) {
-        List<Flow> all = flowDao.findAll();
-        eventManager.publish(new FlowInitEvent(this, all));
-    }
-
     @EventListener
     public void deleteUserFromFlow(UserDeletedEvent event) {
         // TODO:
@@ -340,4 +359,15 @@ private void setupDefaultVars(Flow flow) {
         Vars<VarValue> localVars = flow.getLocally();
         localVars.put(Variables.Flow.Name, VarValue.of(flow.getName(), VarType.STRING, false));
     }
+
+    private String loadYmlFromTemplate(String desc) throws IOException {
+        for (Template t : templates) {
+            if (t.getDesc().equals(desc)) {
+                String source = t.getSourceWithDomain(appProperties.getResourceDomain());
+                return httpRequestManager.get(source);
+            }
+        }
+
+        throw new NotFoundException("Unable to load template {0} content", desc);
+    }
 }
diff --git a/core/src/main/java/com/flowci/core/flow/service/YmlService.java b/core/src/main/java/com/flowci/core/flow/service/YmlService.java
index 012d8183a..fc3cf1db2 100644
--- a/core/src/main/java/com/flowci/core/flow/service/YmlService.java
+++ b/core/src/main/java/com/flowci/core/flow/service/YmlService.java
@@ -58,7 +58,9 @@ public interface YmlService {
      *
      * @throws com.flowci.exception.ArgumentException if yml string is empty or null
      */
-    Yml saveYml(Flow flow, String name, String ymlInB64);
+    Yml saveYml(Flow flow, String name, String yml);
+
+    Yml saveYmlFromB64(Flow flow, String name, String ymlInB64);
 
     /**
      * Delete all yaml of flow
diff --git a/core/src/main/java/com/flowci/core/flow/service/YmlServiceImpl.java b/core/src/main/java/com/flowci/core/flow/service/YmlServiceImpl.java
index 040415ea1..26590b757 100644
--- a/core/src/main/java/com/flowci/core/flow/service/YmlServiceImpl.java
+++ b/core/src/main/java/com/flowci/core/flow/service/YmlServiceImpl.java
@@ -18,6 +18,7 @@
 
 import com.flowci.core.common.manager.ConditionManager;
 import com.flowci.core.common.manager.SpringEventManager;
+import com.flowci.core.config.event.GetConfigEvent;
 import com.flowci.core.flow.dao.FlowDao;
 import com.flowci.core.flow.dao.YmlDao;
 import com.flowci.core.flow.domain.Flow;
@@ -51,6 +52,7 @@ public class YmlServiceImpl implements YmlService {
 
     private final List<NodeElementChecker> elementCheckers = ImmutableList.of(
             new ConditionChecker(),
+            new ConfigChecker(),
             new PluginChecker(),
             new SecretChecker()
     );
@@ -102,12 +104,11 @@ public String getYmlString(String flowId, String name) {
     }
 
     @Override
-    public Yml saveYml(Flow flow, String name, String ymlInB64) {
-        if (!StringHelper.hasValue(ymlInB64)) {
+    public Yml saveYml(Flow flow, String name, String yaml) {
+        if (!StringHelper.hasValue(yaml)) {
             throw new ArgumentException("YAML content cannot be null or empty");
         }
 
-        String yaml = StringHelper.fromBase64(ymlInB64);
         FlowNode root = YmlParser.load(yaml);
         NodeTree tree = NodeTree.create(root);
 
@@ -118,7 +119,7 @@ public Yml saveYml(Flow flow, String name, String ymlInB64) {
             }
         }
 
-        Yml ymlObj = getOrCreate(flow.getId(), name, ymlInB64);
+        Yml ymlObj = getOrCreate(flow.getId(), name, StringHelper.toBase64(yaml));
         try {
             ymlDao.save(ymlObj);
         } catch (DuplicateKeyException e) {
@@ -136,6 +137,12 @@ public Yml saveYml(Flow flow, String name, String ymlInB64) {
         return ymlObj;
     }
 
+    @Override
+    public Yml saveYmlFromB64(Flow flow, String name, String ymlInB64) {
+        String yaml = StringHelper.fromBase64(ymlInB64);
+        return saveYml(flow, name, yaml);
+    }
+
     @Override
     public void delete(String flowId) {
         ymlDao.deleteAllByFlowId(flowId);
@@ -206,4 +213,18 @@ public Optional<RuntimeException> apply(NodeTree tree) {
             return Optional.empty();
         }
     }
+
+    private class ConfigChecker implements NodeElementChecker {
+
+        @Override
+        public Optional<RuntimeException> apply(NodeTree tree) {
+            for (String c : tree.getConfigs()) {
+                GetConfigEvent event = eventManager.publish(new GetConfigEvent(this, c));
+                if (event.hasError()) {
+                    return Optional.of(event.getError());
+                }
+            }
+            return Optional.empty();
+        }
+    }
 }
diff --git a/core/src/main/java/com/flowci/core/job/manager/CmdManagerImpl.java b/core/src/main/java/com/flowci/core/job/manager/CmdManagerImpl.java
index 781f1f169..9bf1de671 100644
--- a/core/src/main/java/com/flowci/core/job/manager/CmdManagerImpl.java
+++ b/core/src/main/java/com/flowci/core/job/manager/CmdManagerImpl.java
@@ -65,6 +65,7 @@ public ShellIn createShellCmd(Job job, Step step, Node node) {
                 .setTimeout(r.fetchTimeout(job.getTimeout()))
                 .setRetry(r.fetchRetry(0))
                 .setSecrets(r.getSecrets())
+                .setConfigs(r.getConfigs())
                 .setCache(r.getCache());
 
         if (r.hasPlugin()) {
diff --git a/core/src/main/java/com/flowci/core/job/service/JobActionServiceImpl.java b/core/src/main/java/com/flowci/core/job/service/JobActionServiceImpl.java
index 13d659e0c..75e685888 100644
--- a/core/src/main/java/com/flowci/core/job/service/JobActionServiceImpl.java
+++ b/core/src/main/java/com/flowci/core/job/service/JobActionServiceImpl.java
@@ -53,10 +53,10 @@
 import groovy.util.ScriptException;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.PostConstruct;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -163,8 +163,8 @@ public class JobActionServiceImpl implements JobActionService {
     @Autowired
     private StateMachine<JobSmContext> sm;
 
-    @EventListener
-    public void init(ContextRefreshedEvent ignore) {
+    @PostConstruct
+    public void init() {
         try {
             fromPending();
             fromLoading();
diff --git a/core/src/main/java/com/flowci/core/job/service/JobEventServiceImpl.java b/core/src/main/java/com/flowci/core/job/service/JobEventServiceImpl.java
index f9f738883..9afb9e6f4 100644
--- a/core/src/main/java/com/flowci/core/job/service/JobEventServiceImpl.java
+++ b/core/src/main/java/com/flowci/core/job/service/JobEventServiceImpl.java
@@ -39,11 +39,11 @@
 import com.flowci.tree.FlowNode;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.event.EventListener;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.PostConstruct;
 import java.io.IOException;
 import java.util.Arrays;
 
@@ -81,6 +81,20 @@ public class JobEventServiceImpl implements JobEventService {
     @Autowired
     private StepService stepService;
 
+    @PostConstruct
+    public void startJobDeadLetterConsumer() throws IOException {
+        String deadLetterQueue = rabbitProperties.getJobDlQueue();
+        jobsQueueManager.startConsumer(deadLetterQueue, true, (header, body, envelope) -> {
+            String jobId = new String(body);
+            try {
+                jobActionService.toTimeout(jobId);
+            } catch (Exception e) {
+                log.warn(e);
+            }
+            return false;
+        }, null);
+    }
+
     //====================================================================
     //        %% Internal events
     //====================================================================
@@ -178,24 +192,6 @@ public void handleCallback(ShellOut so) {
         jobActionService.toContinue(jobId, so);
     }
 
-    //====================================================================
-    //        %% Init events
-    //====================================================================
-
-    @EventListener(value = ContextRefreshedEvent.class)
-    public void startJobDeadLetterConsumer() throws IOException {
-        String deadLetterQueue = rabbitProperties.getJobDlQueue();
-        jobsQueueManager.startConsumer(deadLetterQueue, true, (header, body, envelope) -> {
-            String jobId = new String(body);
-            try {
-                jobActionService.toTimeout(jobId);
-            } catch (Exception e) {
-                log.warn(e);
-            }
-            return false;
-        }, null);
-    }
-
     //====================================================================
     //        %% Utils
     //====================================================================
diff --git a/core/src/main/java/com/flowci/core/plugin/domain/PluginRepoInfo.java b/core/src/main/java/com/flowci/core/plugin/domain/PluginRepoInfo.java
index 8d21e5bac..ddef588d0 100644
--- a/core/src/main/java/com/flowci/core/plugin/domain/PluginRepoInfo.java
+++ b/core/src/main/java/com/flowci/core/plugin/domain/PluginRepoInfo.java
@@ -16,30 +16,29 @@
 
 package com.flowci.core.plugin.domain;
 
+import com.flowci.core.common.domain.SourceWithDomain;
 import com.flowci.domain.Version;
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import org.springframework.data.mongodb.core.index.Indexed;
 
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * @author yang
  */
 @Getter
 @Setter
-@EqualsAndHashCode(of = {"name"})
-@ToString(of = {"name", "version", "source", "branch"})
-public class PluginRepoInfo implements Serializable {
+@EqualsAndHashCode(of = {"name"}, callSuper = false)
+@ToString(of = {"name", "version", "branch"})
+public class PluginRepoInfo extends SourceWithDomain {
 
     @Indexed(name = "index_plugins_name", unique = true)
     private String name;
 
-    private String source; // git repo url
-
     private String branch = "master";
 
     private String description;
diff --git a/core/src/main/java/com/flowci/core/plugin/service/PluginService.java b/core/src/main/java/com/flowci/core/plugin/service/PluginService.java
index 13a45aa56..7c50fecf1 100644
--- a/core/src/main/java/com/flowci/core/plugin/service/PluginService.java
+++ b/core/src/main/java/com/flowci/core/plugin/service/PluginService.java
@@ -19,6 +19,7 @@
 import com.flowci.core.plugin.domain.Plugin;
 import com.flowci.core.plugin.domain.PluginRepoInfo;
 import com.flowci.domain.Vars;
+import org.springframework.core.io.Resource;
 
 import java.nio.file.Path;
 import java.util.Collection;
@@ -71,7 +72,7 @@ public interface PluginService {
     /**
      * Load plugin repo info
      */
-    List<PluginRepoInfo> load(String repoUrl);
+    List<PluginRepoInfo> load(Resource repoUri);
 
     /**
      * Git clone plugin repos in Async
diff --git a/core/src/main/java/com/flowci/core/plugin/service/PluginServiceImpl.java b/core/src/main/java/com/flowci/core/plugin/service/PluginServiceImpl.java
index 8158ae287..40fce5e49 100644
--- a/core/src/main/java/com/flowci/core/plugin/service/PluginServiceImpl.java
+++ b/core/src/main/java/com/flowci/core/plugin/service/PluginServiceImpl.java
@@ -20,7 +20,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.flowci.core.common.config.AppProperties;
 import com.flowci.core.common.git.GitClient;
-import com.flowci.core.common.manager.HttpRequestManager;
 import com.flowci.core.common.manager.VarManager;
 import com.flowci.core.plugin.dao.PluginDao;
 import com.flowci.core.plugin.domain.Plugin;
@@ -38,18 +37,18 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.event.EventListener;
+import org.springframework.core.io.Resource;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.PostConstruct;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
-import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.time.Instant;
 import java.util.*;
 
 /**
@@ -76,6 +75,9 @@ public class PluginServiceImpl implements PluginService {
     @Autowired
     private Path pluginDir;
 
+    @Autowired
+    private AppProperties appProperties;
+
     @Autowired
     private AppProperties.Plugin pluginProperties;
 
@@ -91,11 +93,13 @@ public class PluginServiceImpl implements PluginService {
     @Autowired
     private VarManager varManager;
 
-    @Autowired
-    private HttpRequestManager httpManager;
-
     private final Object reloadLock = new Object();
 
+    @PostConstruct
+    public void init() {
+        reload();
+    }
+
     @EventListener
     public void onGetPluginEvent(GetPluginEvent event) {
         try {
@@ -192,13 +196,11 @@ public Path getDir(Plugin plugin) {
     }
 
     @Override
-    public List<PluginRepoInfo> load(String repoUrl) {
+    public List<PluginRepoInfo> load(Resource repoUri) {
         try {
-            repoUrl = repoUrl + "?t=" + Instant.now().toEpochMilli();
-            String body = httpManager.get(repoUrl);
-            return objectMapper.readValue(body, RepoListType);
+            return objectMapper.readValue(repoUri.getInputStream(), RepoListType);
         } catch (Throwable e) {
-            log.warn("Unable to load plugin repo '{}' : {}", repoUrl, e.getMessage());
+            log.warn("Unable to load plugin repo '{}' : {}", repoUri, e.getMessage());
             return Collections.emptyList();
         }
     }
@@ -225,14 +227,12 @@ public void clone(List<PluginRepoInfo> repos) {
     public void reload() {
         synchronized (reloadLock) {
             pluginDao.deleteAll();
-
-            String repoUrl = pluginProperties.getDefaultRepo();
-            List<PluginRepoInfo> repos = load(repoUrl);
+            List<PluginRepoInfo> repos = load(pluginProperties.getDefaultRepo());
             clone(repos);
         }
     }
 
-    @Scheduled(fixedRate = 1000 * 3600)
+    @Scheduled(initialDelay = 1000 * 3600, fixedRate = 1000 * 3600)
     public void scheduleSync() {
         if (pluginProperties.getAutoUpdate()) {
             reload();
@@ -256,7 +256,14 @@ private Plugin clone(PluginRepoInfo repo) throws Exception {
         log.info("Start to load plugin: {}", repo);
         Path dir = getPluginRepoDir(repo.getName(), repo.getVersion().toString());
 
-        GitClient client = new GitClient(repo.getSource(), null, null);
+        String rd = appProperties.getResourceDomain();
+        String source = repo.getSourceWithDomain(rd);
+
+        if (!StringHelper.hasValue(source)) {
+            throw new NotFoundException("Plugin {0} source is missing for domain {1}", repo.getName(), rd);
+        }
+
+        GitClient client = new GitClient(source, null, null);
         client.klone(dir, repo.getBranch());
 
         return load(dir.toFile(), repo);
diff --git a/core/src/main/resources/application.properties b/core/src/main/resources/application.properties
index ed15459a8..e362b4214 100644
--- a/core/src/main/resources/application.properties
+++ b/core/src/main/resources/application.properties
@@ -2,7 +2,7 @@ logging.level.org.apache.zookeeper=ERROR
 logging.level.org.apache.curator.framework=ERROR
 logging.level.com.flowci.core=${FLOWCI_LOG_LEVEL:INFO}
 
-info.app.version=0.21.21
+info.app.version=1.21.33
 info.app.name=flow.ci
 
 server.port=${FLOWCI_SERVER_PORT:8080}
diff --git a/core/src/main/resources/default/smtp-demo-config.yml b/core/src/main/resources/default/smtp-demo-config.yml
index 438634ad1..8e437eea8 100644
--- a/core/src/main/resources/default/smtp-demo-config.yml
+++ b/core/src/main/resources/default/smtp-demo-config.yml
@@ -1,5 +1,5 @@
 kind: smtp
-name: sendgrid-demo
+name: sendgrid_demo
 smtp:
   server: smtp.sendgrid.net
   port: 587
diff --git a/core/src/main/resources/flow.properties b/core/src/main/resources/flow.properties
index 867b7e68e..2d5c2359b 100644
--- a/core/src/main/resources/flow.properties
+++ b/core/src/main/resources/flow.properties
@@ -3,6 +3,7 @@ app.flow-dir=${app.workspace}/flows
 app.site-dir=${app.workspace}/sites-static-resources
 app.secret=${FLOWCI_SECRET:qazWSXedcRFV12#$}
 app.auto-local-agent-host=${FLOWCI_AUTO_AGENT:true}
+app.resource-domain=${FLOWCI_RESOURCE_DOMAIN}
 app.default-smtp-config=true
 app.socket-container=true
 app.core-pool-size=100
diff --git a/core/src/main/resources/welcome.txt b/core/src/main/resources/welcome.txt
new file mode 100644
index 000000000..887a9f956
--- /dev/null
+++ b/core/src/main/resources/welcome.txt
@@ -0,0 +1,7 @@
+
+                 _                                 _             __  _                            _
+__      __  ___ | |  ___   ___   _ __ ___    ___  | |_   ___    / _|| |  ___  __      __     ___ (_)
+\ \ /\ / / / _ \| | / __| / _ \ | '_ ` _ \  / _ \ | __| / _ \  | |_ | | / _ \ \ \ /\ / /    / __|| |
+ \ V  V / |  __/| || (__ | (_) || | | | | ||  __/ | |_ | (_) | |  _|| || (_) | \ V  V /  _ | (__ | |
+  \_/\_/   \___||_| \___| \___/ |_| |_| |_| \___|  \__| \___/  |_|  |_| \___/   \_/\_/  (_) \___||_|
+
diff --git a/core/src/test/java/com/flowci/core/test/flow/YmlServiceTest.java b/core/src/test/java/com/flowci/core/test/flow/YmlServiceTest.java
index 877476d33..871905e92 100644
--- a/core/src/test/java/com/flowci/core/test/flow/YmlServiceTest.java
+++ b/core/src/test/java/com/flowci/core/test/flow/YmlServiceTest.java
@@ -60,7 +60,7 @@ public void should_save_yml_for_flow() throws IOException {
         Assert.assertNotNull(yml);
 
         Assert.assertNotNull(yml.getId());
-        Assert.assertEquals(flow.getId(), yml.getId());
+        Assert.assertEquals(flow.getId(), yml.getFlowId());
         Assert.assertEquals(Yml.DEFAULT_NAME, yml.getName());
     }
 
diff --git a/core/src/test/java/com/flowci/core/test/job/CmdManagerTest.java b/core/src/test/java/com/flowci/core/test/job/CmdManagerTest.java
index 6d07aada2..9dec4573a 100644
--- a/core/src/test/java/com/flowci/core/test/job/CmdManagerTest.java
+++ b/core/src/test/java/com/flowci/core/test/job/CmdManagerTest.java
@@ -76,7 +76,7 @@ public void should_apply_flow_level_docker_option() throws IOException {
         // given: flow and job
         Flow flow = flowService.create("hello");
         String yaml = StringHelper.toString(load("flow-with-root-docker.yml"));
-        Yml ymlObj = ymlService.saveYml(flow, Yml.DEFAULT_NAME, StringHelper.toBase64(yaml));
+        Yml ymlObj = ymlService.saveYml(flow, Yml.DEFAULT_NAME, yaml);
         Job job = jobService.create(flow, ymlObj.getRaw(), Job.Trigger.MANUAL, new StringVars());
         Assert.assertNotNull(job);
 
@@ -115,7 +115,7 @@ public void should_create_cmd_in_with_default_plugin_value() throws IOException
         // given: flow and job
         Flow flow = flowService.create("hello");
         String yaml = StringHelper.toString(load("flow-with-plugin.yml"));
-        Yml yml = ymlService.saveYml(flow, Yml.DEFAULT_NAME, StringHelper.toBase64(yaml));
+        Yml yml = ymlService.saveYml(flow, Yml.DEFAULT_NAME, yaml);
 
         Job job = jobService.create(flow, yml.getRaw(), Job.Trigger.MANUAL, new StringVars());
         Assert.assertNotNull(job);
@@ -153,7 +153,7 @@ public void should_handle_step_in_step() throws IOException {
         // given: flow and job
         Flow flow = flowService.create("hello");
         String yaml = StringHelper.toString(load("step-in-step.yml"));
-        Yml yml = ymlService.saveYml(flow, Yml.DEFAULT_NAME, StringHelper.toBase64(yaml));
+        Yml yml = ymlService.saveYml(flow, Yml.DEFAULT_NAME, yaml);
 
         Job job = jobService.create(flow, yml.getRaw(), Job.Trigger.MANUAL, new StringVars());
         Assert.assertNotNull(job);
diff --git a/core/src/test/java/com/flowci/core/test/job/JobServiceTest.java b/core/src/test/java/com/flowci/core/test/job/JobServiceTest.java
index 48c9906f8..7c2af8e4d 100644
--- a/core/src/test/java/com/flowci/core/test/job/JobServiceTest.java
+++ b/core/src/test/java/com/flowci/core/test/job/JobServiceTest.java
@@ -127,7 +127,7 @@ public void mockFlowAndYml() throws IOException {
         mockLogin();
         flow = flowService.create("hello");
         String yaml = StringHelper.toString(load("flow.yml"));
-        yml = ymlService.saveYml(flow, Yml.DEFAULT_NAME, StringHelper.toBase64(yaml));
+        yml = ymlService.saveYml(flow, Yml.DEFAULT_NAME, yaml);
     }
 
     @Test
@@ -225,7 +225,7 @@ public void should_finish_whole_job() throws InterruptedException, IOException {
         pluginDao.save(p);
 
         String yaml = StringHelper.toString(load("flow-with-notify.yml"));
-        yml = ymlService.saveYml(flow, Yml.DEFAULT_NAME, StringHelper.toBase64(yaml));
+        yml = ymlService.saveYml(flow, Yml.DEFAULT_NAME, yaml);
 
         Agent agent = agentService.create(new AgentOption().setName("hello.agent"));
         mockAgentOnline(agent.getToken());
@@ -389,7 +389,7 @@ public void should_handle_cmd_callback_for_success_status() {
     public void should_handle_cmd_callback_for_failure_status() throws IOException {
         // init: agent and job
         String yaml = StringHelper.toString(load("flow-with-failure.yml"));
-        yml = ymlService.saveYml(flow, Yml.DEFAULT_NAME, StringHelper.toBase64(yaml));
+        yml = ymlService.saveYml(flow, Yml.DEFAULT_NAME, yaml);
         Agent agent = agentService.create(new AgentOption().setName("hello.agent"));
         Job job = prepareJobForRunningStatus(agent);
 
@@ -412,7 +412,7 @@ public void should_handle_cmd_callback_for_failure_status() throws IOException {
     public void should_handle_cmd_callback_for_failure_status_but_allow_failure() throws IOException {
         // init: agent and job
         String yaml = StringHelper.toString(load("flow-all-failure.yml"));
-        yml = ymlService.saveYml(flow, Yml.DEFAULT_NAME, StringHelper.toBase64(yaml));
+        yml = ymlService.saveYml(flow, Yml.DEFAULT_NAME, yaml);
         Agent agent = agentService.create(new AgentOption().setName("hello.agent"));
         Job job = prepareJobForRunningStatus(agent);
 
@@ -457,7 +457,7 @@ public void should_handle_cmd_callback_for_failure_status_but_allow_failure() th
     public void should_cancel_job_if_agent_offline() throws IOException, InterruptedException {
         // init:
         String yaml = StringHelper.toString(load("flow-with-condition.yml"));
-        yml = ymlService.saveYml(flow, Yml.DEFAULT_NAME, StringHelper.toBase64(yaml));
+        yml = ymlService.saveYml(flow, Yml.DEFAULT_NAME, yaml);
 
         // mock agent online
         Agent agent = agentService.create(new AgentOption().setName("hello.agent.2"));
diff --git a/core/src/test/java/com/flowci/core/test/plugin/PluginServiceTest.java b/core/src/test/java/com/flowci/core/test/plugin/PluginServiceTest.java
index c3d8e0eda..2f97d0e69 100644
--- a/core/src/test/java/com/flowci/core/test/plugin/PluginServiceTest.java
+++ b/core/src/test/java/com/flowci/core/test/plugin/PluginServiceTest.java
@@ -16,11 +16,6 @@
 
 package com.flowci.core.test.plugin;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
-
 import com.flowci.core.plugin.domain.Plugin;
 import com.flowci.core.plugin.domain.PluginRepoInfo;
 import com.flowci.core.plugin.event.RepoCloneEvent;
@@ -30,18 +25,19 @@
 import com.flowci.domain.Version;
 import com.flowci.util.StringHelper;
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
+import org.junit.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationListener;
+import org.springframework.core.io.UrlResource;
+
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.MalformedURLException;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationListener;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
 
 /**
  * @author yang
@@ -66,8 +62,8 @@ public void mockPluginRepo() throws IOException {
     }
 
     @Test
-    public void should_load_plugin_repos_from_url() {
-        List<PluginRepoInfo> repos = pluginService.load(RepoURL);
+    public void should_load_plugin_repos_from_url() throws MalformedURLException {
+        List<PluginRepoInfo> repos = pluginService.load(new UrlResource(RepoURL));
         Assert.assertEquals(1, repos.size());
 
         PluginRepoInfo repo = repos.get(0);
@@ -82,7 +78,7 @@ public void should_load_plugin_repos_from_url() {
     @Test
     public void should_clone_plugin_repo() throws Throwable {
         // init:
-        List<PluginRepoInfo> repos = pluginService.load(RepoURL);
+        List<PluginRepoInfo> repos = pluginService.load(new UrlResource(RepoURL));
 
         // init counter
         CountDownLatch counter = new CountDownLatch(1);
diff --git a/core/src/test/resources/flow-with-plugin-not-found.yml b/core/src/test/resources/flow-with-plugin-not-found.yml
index 558949f13..dfa3fcdee 100644
--- a/core/src/test/resources/flow-with-plugin-not-found.yml
+++ b/core/src/test/resources/flow-with-plugin-not-found.yml
@@ -7,7 +7,7 @@ steps:
       FLOW_WORKSPACE: "echo step"
       FLOW_VERSION: "echo step version"
     allow_failure: true
-    bash: "not found.."
+    plugin: "not found.."
 
   - name: step2
     allow_failure: false
diff --git a/tree/src/main/java/com/flowci/tree/NodeTree.java b/tree/src/main/java/com/flowci/tree/NodeTree.java
index 45f9056cc..161938be5 100644
--- a/tree/src/main/java/com/flowci/tree/NodeTree.java
+++ b/tree/src/main/java/com/flowci/tree/NodeTree.java
@@ -29,7 +29,7 @@
 @Getter
 public final class NodeTree {
 
-    private static final int DefaultSize = 20;
+    private static final int DefaultSize = 10;
 
     private static final int DefaultSizeForPrev = 5;
 
@@ -57,6 +57,8 @@ public static NodeTree create(FlowNode root) {
 
     private final Set<String> secrets = new HashSet<>(DefaultSize);
 
+    private final Set<String> configs = new HashSet<>(DefaultSize);
+
     private int maxHeight = 1;
 
     public NodeTree(FlowNode root) {
@@ -207,6 +209,10 @@ private void buildMetaData() {
                 if (r.hasSecrets()) {
                     secrets.addAll(r.getSecrets());
                 }
+
+                if (r.hasConfigs()) {
+                    configs.addAll(r.getConfigs());
+                }
             }
 
             if (node instanceof FlowNode) {
diff --git a/tree/src/main/java/com/flowci/tree/RegularStepNode.java b/tree/src/main/java/com/flowci/tree/RegularStepNode.java
index bf8300003..78b0a56d3 100644
--- a/tree/src/main/java/com/flowci/tree/RegularStepNode.java
+++ b/tree/src/main/java/com/flowci/tree/RegularStepNode.java
@@ -57,6 +57,11 @@ public final class RegularStepNode extends Node {
      */
     private Set<String> secrets = new HashSet<>(0);
 
+    /**
+     * Included config name in the step
+     */
+    private Set<String> configs = new HashSet<>(0);
+
     /**
      * Is allow failure
      */
@@ -91,6 +96,11 @@ public boolean hasSecrets() {
         return !secrets.isEmpty();
     }
 
+    @JsonIgnore
+    public boolean hasConfigs() {
+        return !configs.isEmpty();
+    }
+
     @JsonIgnore
     public boolean hasTimeout() {
         return timeout != null;
diff --git a/tree/src/main/java/com/flowci/tree/yml/StepYml.java b/tree/src/main/java/com/flowci/tree/yml/StepYml.java
index 34855189a..53c791448 100644
--- a/tree/src/main/java/com/flowci/tree/yml/StepYml.java
+++ b/tree/src/main/java/com/flowci/tree/yml/StepYml.java
@@ -66,6 +66,8 @@ public class StepYml extends YmlBase<RegularStepNode> {
 
     private List<String> secrets = new LinkedList<>();
 
+    private List<String> configs = new LinkedList<>();
+
     /**
      * Only for parallel step, other fields will not valid
      */
@@ -114,6 +116,7 @@ public Node toNode(Node parent, int index) {
         step.setAllowFailure(allow_failure != null && allow_failure);
         step.setEnvironments(getVariableMap());
         step.setSecrets(Sets.newHashSet(secrets));
+        step.setConfigs(Sets.newHashSet(configs));
 
         setCacheToNode(step);
         setDockerToNode(step);