diff --git a/cookiecutter.json b/cookiecutter.json
index 4d42877..27e4cfb 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -2,5 +2,6 @@
     "project_name": "salt-formula",
     "repo_name": "{{ cookiecutter.project_name|replace('-', '_') }}",
     "service_name": "{{ cookiecutter.project_name.split('-')[0] }}",
+    "role_name": "server",
     "license_holder": "tcp cloud a.s."
 }
diff --git "a/\173\173cookiecutter.service_name\175\175/init.sls" "b/\173\173cookiecutter.service_name\175\175/init.sls"
index f740af3..4f7fe15 100644
--- "a/\173\173cookiecutter.service_name\175\175/init.sls"
+++ "b/\173\173cookiecutter.service_name\175\175/init.sls"
@@ -1,6 +1,6 @@
-{%- if pillar.{{cookiecutter.service_name}} is defined %}
+{{ '{%-' }} if pillar.{{cookiecutter.service_name}} is defined {{ '%}' }}
 include:
-{%- if pillar.{{cookiecutter.service_name}}.{{cookiecutter.role_name}} is defined %}
+{{ '{%-' }} if pillar.{{cookiecutter.service_name}}.{{cookiecutter.role_name}} is defined {{ '%}' }}
 - {{cookiecutter.service_name}}.{{cookiecutter.role_name}}
-{%- endif %}
-{%- endif %}
\ No newline at end of file
+{{ '{%-' }} endif {{ '%}' }}
+{{ '{%-' }} endif {{ '%}' }}
diff --git "a/\173\173cookiecutter.service_name\175\175/map.jinja" "b/\173\173cookiecutter.service_name\175\175/map.jinja"
index 6208ea6..dea584b 100644
--- "a/\173\173cookiecutter.service_name\175\175/map.jinja"
+++ "b/\173\173cookiecutter.service_name\175\175/map.jinja"
@@ -1,8 +1,9 @@
-{%- set source_engine = salt['pillar.get']('{{cookiecutter.service_name}}:{{cookiecutter.role_name}}:source:engine') %}
+{% raw %}
+{%- set {% endraw %}source_engine = salt['pillar.get']('{{cookiecutter.service_name}}:{{cookiecutter.role_name}}:source:engine'){% raw %} %}
 
 {%- load_yaml as base_defaults %}
 {%- if source_engine == 'git' %}
-Debian:
+{% endraw %}Debian:
   pkgs:
   - python-psycopg2
   dir:
@@ -16,13 +17,13 @@
     base: /srv/{{cookiecutter.service_name}}/venv
     home: /var/lib/{{cookiecutter.service_name}}
     workspace: /srv/{{cookiecutter.service_name}}/workspace
-{%- else %}
+{% raw %}{%- else %}{% endraw %}
 Debian:
   pkgs:
   - helpdesk
   dir:
     base: /usr/lib/{{cookiecutter.service_name}}
-{%- endif %}
+{% raw %}{%- endif %}
 {%- endload %}
 
-{%- set {{cookiecutter.role_name}} = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('{{cookiecutter.service_name}}:{{cookiecutter.role_name}}')) %}
\ No newline at end of file
+{%-{% endraw %} set {{cookiecutter.role_name}} = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('{{cookiecutter.service_name}}:{{cookiecutter.role_name}}')) {% raw %}%}{% endraw %}
\ No newline at end of file
diff --git "a/\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.role_name\175\175.sls" "b/\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.role_name\175\175.sls"
index 92c5a31..3fcdea5 100644
--- "a/\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.role_name\175\175.sls"
+++ "b/\173\173cookiecutter.service_name\175\175/\173\173cookiecutter.role_name\175\175.sls"
@@ -1,4 +1,4 @@
-{%- from "{{cookiecutter.service_name}}/map.jinja" import {{cookiecutter.role_name}} with context %}
-{%- if {{cookiecutter.role_name}}.enabled %}
+{{ '{%-' }} from "{{cookiecutter.service_name}}/map.jinja" import {{cookiecutter.role_name}} with context {{ '%}' }}
+{{ '{%-' }} if {{cookiecutter.role_name}}.enabled {{ '%}' }}
 
-{%- endif %}
+{{ '{%-' }} endif {{ '%}' }}