diff --git a/postgresql-walg/templates/configmap.yaml b/postgresql-walg/templates/configmap.yaml
index addf084..5843e57 100755
--- a/postgresql-walg/templates/configmap.yaml
+++ b/postgresql-walg/templates/configmap.yaml
@@ -10,4 +10,4 @@ metadata:
 data:
   {{- if .Values.metrics.customMetrics }}
   custom-metrics.yaml: {{ toYaml .Values.metrics.customMetrics | quote }}
-  {{- end }}
\ No newline at end of file
+  {{- end }}
diff --git a/postgresql-walg/values.yaml b/postgresql-walg/values.yaml
index 13d76c5..887dd05 100755
--- a/postgresql-walg/values.yaml
+++ b/postgresql-walg/values.yaml
@@ -169,4 +169,4 @@ backup:
     minWalSize: 512MB
     walBuffers: 4MB
     checkpointCompletionTarget: 0.7
-    defaultStatisticsTarget: 100
\ No newline at end of file
+    defaultStatisticsTarget: 100
diff --git a/starters/touchin-autotest/templates/configmap.yaml b/starters/touchin-autotest/templates/configmap.yaml
new file mode 100644
index 0000000..92eadff
--- /dev/null
+++ b/starters/touchin-autotest/templates/configmap.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: git-{{ include "<CHARTNAME>.fullname" . }}
+{{- if or .Values.git.branch .Values.git.url }}
+data:
+  {{- if .Values.git.branch }}
+  branch: "{{ .Values.git.branch }}"
+  {{- end }}
+  {{- if .Values.git.url }}
+  url: "{{ .Values.git.url }}"
+  {{- end }}
+{{- end }}
diff --git a/starters/touchin-autotest/values.yaml b/starters/touchin-autotest/values.yaml
index 0067902..a9de623 100644
--- a/starters/touchin-autotest/values.yaml
+++ b/starters/touchin-autotest/values.yaml
@@ -12,6 +12,10 @@ image:
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
 
+git:
+  branch: ""
+  url: ""
+
 imagePullSecrets:
   - name: touchin-registry
 nameOverride: ""
diff --git a/starters/touchin-docs/templates/configmap.yaml b/starters/touchin-docs/templates/configmap.yaml
index 64c320d..92eadff 100644
--- a/starters/touchin-docs/templates/configmap.yaml
+++ b/starters/touchin-docs/templates/configmap.yaml
@@ -2,6 +2,12 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: git-{{ include "<CHARTNAME>.fullname" . }}
+{{- if or .Values.git.branch .Values.git.url }}
 data:
-  branch: {{ .Values.git.branch }}
-  url: {{ .Values.git.url }}
+  {{- if .Values.git.branch }}
+  branch: "{{ .Values.git.branch }}"
+  {{- end }}
+  {{- if .Values.git.url }}
+  url: "{{ .Values.git.url }}"
+  {{- end }}
+{{- end }}
diff --git a/starters/touchin-mock/templates/configmap.yaml b/starters/touchin-mock/templates/configmap.yaml
index 64c320d..92eadff 100644
--- a/starters/touchin-mock/templates/configmap.yaml
+++ b/starters/touchin-mock/templates/configmap.yaml
@@ -2,6 +2,12 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: git-{{ include "<CHARTNAME>.fullname" . }}
+{{- if or .Values.git.branch .Values.git.url }}
 data:
-  branch: {{ .Values.git.branch }}
-  url: {{ .Values.git.url }}
+  {{- if .Values.git.branch }}
+  branch: "{{ .Values.git.branch }}"
+  {{- end }}
+  {{- if .Values.git.url }}
+  url: "{{ .Values.git.url }}"
+  {{- end }}
+{{- end }}
diff --git a/starters/touchin-server/templates/configmap.yaml b/starters/touchin-server/templates/configmap.yaml
index 64c320d..92eadff 100644
--- a/starters/touchin-server/templates/configmap.yaml
+++ b/starters/touchin-server/templates/configmap.yaml
@@ -2,6 +2,12 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: git-{{ include "<CHARTNAME>.fullname" . }}
+{{- if or .Values.git.branch .Values.git.url }}
 data:
-  branch: {{ .Values.git.branch }}
-  url: {{ .Values.git.url }}
+  {{- if .Values.git.branch }}
+  branch: "{{ .Values.git.branch }}"
+  {{- end }}
+  {{- if .Values.git.url }}
+  url: "{{ .Values.git.url }}"
+  {{- end }}
+{{- end }}
diff --git a/starters/touchin-web/templates/configmap.yaml b/starters/touchin-web/templates/configmap.yaml
index 64c320d..92eadff 100644
--- a/starters/touchin-web/templates/configmap.yaml
+++ b/starters/touchin-web/templates/configmap.yaml
@@ -2,6 +2,12 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: git-{{ include "<CHARTNAME>.fullname" . }}
+{{- if or .Values.git.branch .Values.git.url }}
 data:
-  branch: {{ .Values.git.branch }}
-  url: {{ .Values.git.url }}
+  {{- if .Values.git.branch }}
+  branch: "{{ .Values.git.branch }}"
+  {{- end }}
+  {{- if .Values.git.url }}
+  url: "{{ .Values.git.url }}"
+  {{- end }}
+{{- end }}