diff --git a/backend/src/main/resources/defaults-system.json b/backend/src/main/resources/defaults-system.json
index d30672dc8..9a0b42575 100755
--- a/backend/src/main/resources/defaults-system.json
+++ b/backend/src/main/resources/defaults-system.json
@@ -26,5 +26,7 @@
   "genesis.system.metrics": {"default": "true","description": "Gathering of system metrics: on if true, off otherwise",
    "restartRequired": true,
     "validation": {"Must be true or false": "true|false"}
-   }
+   },
+   "genesis.system.databag.template.repository.path" : {"default" : "templates", "description" : "Filesystem path to databag templates folder", "restartRequired": true},
+   "genesis.system.databag.template.repository.wildcard": {"default": "*.dbtemplate", "description": "Extension for databag templates files", "restartRequired": true}
 }
\ No newline at end of file
diff --git a/backend/src/main/scala/com/griddynamics/genesis/configuration/DatabagTemplateServiceContextImpl.scala b/backend/src/main/scala/com/griddynamics/genesis/configuration/DatabagTemplateServiceContextImpl.scala
index 6636444fb..606e53f6c 100644
--- a/backend/src/main/scala/com/griddynamics/genesis/configuration/DatabagTemplateServiceContextImpl.scala
+++ b/backend/src/main/scala/com/griddynamics/genesis/configuration/DatabagTemplateServiceContextImpl.scala
@@ -9,8 +9,8 @@ import com.griddynamics.genesis.repository.impl.DatabagTemplateRepositoryImpl
 
 @Configuration
 class DatabagTemplateServiceContextImpl extends DatabagTemplateServiceContext {
-  @Value("${genesis.databag.template.repository.path:templates}") var templatePath: String = _
-  @Value("${genesis.databag.template.repository.wildcard:*.dbtemplate}") var wildCard: String = _
+  @Value("${genesis.system.databag.template.repository.path:templates}") var templatePath: String = _
+  @Value("${genesis.system.databag.template.repository.wildcard:*.dbtemplate}") var wildCard: String = _
 
   @Bean
   def databagTemplateRepository: DatabagTemplateRepository = new DatabagTemplateRepositoryImpl(templatePath, wildCard)
diff --git a/test-automation/cucumber/sample.properties.erb b/test-automation/cucumber/sample.properties.erb
index 3bcb01a06..fa08285fe 100755
--- a/test-automation/cucumber/sample.properties.erb
+++ b/test-automation/cucumber/sample.properties.erb
@@ -10,5 +10,5 @@ genesis.template.repository.fs.path=<%= Dir.pwd %>/templates
 genesis.web.admin.sha.password=<%= hash %>
 genesis.web.admin.username=<%= user %>
 genesis.system.security.environment.restriction.enabled=true
-genesis.databag.template.repository.path=<%= Dir.pwd %>/templates
-genesis.databag.template.repository.wildcard=*.dbtemplate
\ No newline at end of file
+genesis.system.databag.template.repository.path=<%= Dir.pwd %>/templates
+genesis.system.databag.template.repository.wildcard=*.dbtemplate
\ No newline at end of file