diff --git a/README.rst b/README.rst
index 0b4377d..4942758 100644
--- a/README.rst
+++ b/README.rst
@@ -51,7 +51,20 @@
 
 .. code-block:: bash
 
-    MY_NEW_SALT_FORMULA_DIR="my_new_salt_formula"
+    MY_NEW_SALT_FORMULA_DIR="watchdog"
     mkdir $MY_NEW_SALT_FORMULA_DIR
     git clone https://github.com/salt-formulas/cookiecutter-salt-formula.git
     docker run --rm -it -u $(id -u):$(id -g) --env HOME=/$MY_NEW_SALT_FORMULA_DIR -v $PWD/$MY_NEW_SALT_FORMULA_DIR:/$MY_NEW_SALT_FORMULA_DIR -v $PWD/cookiecutter-salt-formula:/cookiecutter-salt-formula:ro cookiecutter/cookiecutter /cookiecutter-salt-formula --output-dir /$MY_NEW_SALT_FORMULA_DIR
+    service_name [some_service]: watchdog
+    role_name [server]:
+    initial_version [2018.1]:
+    copyright_year [2018]:
+    copyright_holder [Your Name et al.]: Mirantis, Inc.
+    author_name [John Doe]: Petr Ruzicka
+    author_contact [jdoe@domain.com]: pruzicka@mirantis.com
+    homepage [https://github.com/salt-formulas]:
+    debian_version [xenial]:
+    kitchen_driver [docker]:
+    kitchen_verifier [inspec]:
+    kitchen_formula [watchdog]:
+    kitchen_suites []: server
diff --git a/cookiecutter.json b/cookiecutter.json
index ac6cdce..3a6eb08 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -8,7 +8,7 @@
     "author_contact": "jdoe@domain.com",
     "homepage": "https://github.com/salt-formulas",
 
-    "debian_version": "trusty",
+    "debian_version": "xenial",
 
     "kitchen_driver": "docker",
     "kitchen_verifier": "inspec",
diff --git "a/\173\173cookiecutter.service_name\175\175/README.rst" "b/\173\173cookiecutter.service_name\175\175/README.rst"
index 5b32da7..65d3846 100644
--- "a/\173\173cookiecutter.service_name\175\175/README.rst"
+++ "b/\173\173cookiecutter.service_name\175\175/README.rst"
@@ -1,6 +1,6 @@
 
 ==================================
-{{cookiecutter.service_name}} Formula
+{{cookiecutter.service_name|capfirst}} Formula
 ==================================
 
 Service {{cookiecutter.service_name}} description
diff --git "a/\173\173cookiecutter.service_name\175\175/tests/run_tests.sh" "b/\173\173cookiecutter.service_name\175\175/tests/run_tests.sh"
index 5d43e2e..c1ed03c 100755
--- "a/\173\173cookiecutter.service_name\175\175/tests/run_tests.sh"
+++ "b/\173\173cookiecutter.service_name\175\175/tests/run_tests.sh"
@@ -211,7 +211,7 @@
         minion_id="${state_name}"
         # in case debug-reruns, usefull to make cleanup
         [ -n "$DEBUG" ] && { salt_run saltutil.clear_cache; salt_run saltutil.refresh_pillar; salt_run saltutil.sync_all; }
-        salt_run --id=${minion_id} modelschema.model_validate ${FORMULA_NAME} ${state_name} || { log_err "Execution of ${FORMULA_NAME}.${state_name} failed"; exit 1 ; }
+        salt_run -m ${DEPSDIR}/salt-formula-salt --id=${minion_id} modelschema.model_validate ${FORMULA_NAME} ${state_name} || { log_err "Execution of ${FORMULA_NAME}.${state_name} failed"; exit 1 ; }
     done
 }
 
diff --git "a/\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.service_name\175\175/schemas/server.yaml" "b/\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.service_name\175\175/schemas/server.yaml"
new file mode 100644
index 0000000..74b4f84
--- /dev/null
+++ "b/\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.service_name\175\175/schemas/server.yaml"
@@ -0,0 +1,17 @@
+%YAML 1.1
+---
+"$schema": "http://json-schema.org/draft-06/schema#"
+title: {{cookiecutter.service_name}} daemon role
+description: |
+  {{cookiecutter.service_name|capfirst}} daemon, server role
+type: object
+additionalProperties: false
+
+required:
+  - enabled
+
+properties:
+  enabled:
+    description: |
+      Enables {{cookiecutter.service_name}} daemon service
+    type: boolean