diff --git a/templates/common/config/00-config.conf b/templates/common/config/00-config.conf
index 0481e48a..22b456c3 100644
--- a/templates/common/config/00-config.conf
+++ b/templates/common/config/00-config.conf
@@ -18,8 +18,10 @@ max_logfile_count=1
 max_logfile_size_mb=20
 log_rotation_type=size
 log_file = {{ .LogFile }}
-enabled_backends=default_backend:file
-{{ if (index . "CacheEnabled") -}}
+{{ end }}
+# cache related parameters
+{{ if (index . "CacheEnabled") }}
+>>>>>>> 2e22c55 (Remove enabled_backend entry from 00-config.conf)
 image_cache_dir = {{ .ImageCacheDir }}
 image_cache_max_size =  {{ .CacheMaxSize }}
 image_cache_stall_time = 86400
@@ -35,9 +37,6 @@ db_max_retries = -1
 [file]
 filesystem_store_datadir = /var/lib/glance/images
 
-[glance_store]
-default_backend=default_backend
-
 [keystone_authtoken]
 www_authenticate_uri={{ .KeystonePublicURL }}
 auth_url={{ .KeystoneInternalURL }}