diff --git a/docs/core-concepts/output.md b/docs/core-concepts/output.md
index d078c14e8..1b9aaf190 100644
--- a/docs/core-concepts/output.md
+++ b/docs/core-concepts/output.md
@@ -57,7 +57,7 @@ tools:
       branch: main
       repoType: github
     vars:
-      ImageRepo: "ironcore864/golang-demo"
+      imageRepo: "ironcore864/golang-demo"
     sourceRepo:
       org: devstream-io
       repo: dtm-scaffolding-golang
diff --git a/docs/plugins/argocdapp.md b/docs/plugins/argocdapp.md
index df56db1c5..c87a64a1f 100644
--- a/docs/plugins/argocdapp.md
+++ b/docs/plugins/argocdapp.md
@@ -45,7 +45,7 @@ tools:
       branch: [[ defaultBranch ]]
       repoType: github
     vars:
-      ImageRepo: "[[ dockerhubUsername ]]/[[ repoName ]]"
+      imageRepo: "[[ dockerhubUsername ]]/[[ repoName ]]"
     sourceRepo:
       org: devstream-io
       repo: dtm-scaffolding-golang
diff --git a/docs/plugins/repo-scaffolding.md b/docs/plugins/repo-scaffolding.md
index 748aa6855..48280c385 100644
--- a/docs/plugins/repo-scaffolding.md
+++ b/docs/plugins/repo-scaffolding.md
@@ -116,7 +116,7 @@ tools:
       repo: dtm-scaffolding-golang
       repoType: github
     vars:
-      ImageRepo: dtm-test/golang-repo
+      imageRepo: dtm-test/golang-repo
 ```
 
 This config will create `dtm-test-golang` repo for user test_owner in GitHub, and the variable ImageRepo will be used for template render. 
diff --git a/examples/gitops.yaml b/examples/gitops.yaml
index c9b539a10..3c00c7596 100644
--- a/examples/gitops.yaml
+++ b/examples/gitops.yaml
@@ -30,7 +30,7 @@ tools:
       repo: dtm-scaffolding-golang
       repoType: github
     vars:
-      ImageRepo: "[[ dockerhubUsername ]]/[[ repoName ]]"
+      imageRepo: "[[ dockerhubUsername ]]/[[ repoName ]]"
 - name: jira-github-integ
   instanceID: default
   dependsOn: [ "repo-scaffolding.golang-github" ]
diff --git a/examples/quickstart.yaml b/examples/quickstart.yaml
index 9aa76e307..e7ce1f65f 100644
--- a/examples/quickstart.yaml
+++ b/examples/quickstart.yaml
@@ -19,7 +19,7 @@ tools:
       repo: dtm-scaffolding-golang
       repoType: github
     vars:
-      ImageRepo: YOUR_DOCKER_USERNAME/go-webapp-devstream-demo
+      imageRepo: YOUR_DOCKER_USERNAME/go-webapp-devstream-demo
 - name: githubactions-golang
   instanceID: default
   dependsOn: ["repo-scaffolding.golang-github"]
diff --git a/internal/pkg/plugin/installer/reposcaffolding/installer.go b/internal/pkg/plugin/installer/reposcaffolding/installer.go
index 7d6719b9b..55a9f2fdd 100644
--- a/internal/pkg/plugin/installer/reposcaffolding/installer.go
+++ b/internal/pkg/plugin/installer/reposcaffolding/installer.go
@@ -35,8 +35,7 @@ func InstallRepo(options configmanager.RawOptions) error {
 		processRepoFileFunc(appName, opts.renderTplConfig()),
 	)
 	if err != nil {
-		log.Warnf("repoScaffolding render repoTemplate failed=> %+v", err)
-		return fmt.Errorf("render RepoTemplate files failed")
+		return fmt.Errorf("render RepoTemplate files failed with error: %w", err)
 	}
 
 	// 3. push repo to DestinationRepo
diff --git a/internal/pkg/show/config/plugins/repo-scaffolding.yaml b/internal/pkg/show/config/plugins/repo-scaffolding.yaml
index 392ddbbc6..cb7d80415 100644
--- a/internal/pkg/show/config/plugins/repo-scaffolding.yaml
+++ b/internal/pkg/show/config/plugins/repo-scaffolding.yaml
@@ -23,4 +23,4 @@ tools:
       repoType: YOUR_TEMPLATE_REPO_TYPE
     # this is used for template render
     vars:
-      ImageRepo: YOUR_DOCKERHUB_REPOSITORY
+      imageRepo: YOUR_DOCKERHUB_REPOSITORY
diff --git a/internal/pkg/show/config/templates/gitops.yaml b/internal/pkg/show/config/templates/gitops.yaml
index c9b539a10..3c00c7596 100644
--- a/internal/pkg/show/config/templates/gitops.yaml
+++ b/internal/pkg/show/config/templates/gitops.yaml
@@ -30,7 +30,7 @@ tools:
       repo: dtm-scaffolding-golang
       repoType: github
     vars:
-      ImageRepo: "[[ dockerhubUsername ]]/[[ repoName ]]"
+      imageRepo: "[[ dockerhubUsername ]]/[[ repoName ]]"
 - name: jira-github-integ
   instanceID: default
   dependsOn: [ "repo-scaffolding.golang-github" ]
diff --git a/internal/pkg/show/config/templates/quickstart.yaml b/internal/pkg/show/config/templates/quickstart.yaml
index 0bff386f6..e7ce1f65f 100644
--- a/internal/pkg/show/config/templates/quickstart.yaml
+++ b/internal/pkg/show/config/templates/quickstart.yaml
@@ -1,5 +1,5 @@
 config:
-  state:
+  state: # state config, backend can be local, s3 or k8s
     backend: local
     options:
       stateFile: devstream.state
diff --git a/test/e2e/yaml/e2e-test-local.yaml b/test/e2e/yaml/e2e-test-local.yaml
index ae5a7b734..7f93f9b95 100644
--- a/test/e2e/yaml/e2e-test-local.yaml
+++ b/test/e2e/yaml/e2e-test-local.yaml
@@ -23,7 +23,7 @@ tools:
       branch: [[ defaultBranch ]]
       repoType: github
     vars:
-      ImageRepo: "[[ dockerhubUsername ]]/[[ repoName ]]"
+      imageRepo: "[[ dockerhubUsername ]]/[[ repoName ]]"
     sourceRepo:
       org: devstream-io
       repo: dtm-scaffolding-golang