diff --git a/keepalived/cluster.sls b/keepalived/cluster.sls
index c294712..cfcb536 100644
--- a/keepalived/cluster.sls
+++ b/keepalived/cluster.sls
@@ -16,7 +16,7 @@
 
 {% for instance_name, instance in cluster.instance.iteritems() %}
 
-{{%- if instance.notify_action is defined }}
+{%- if instance.notify_action is defined %}
 
 keepalived_{{ instance_name }}_notify:
   file.managed:
@@ -43,4 +43,4 @@
   - watch:
     - file: keepalived_config
 
-{%- endif %}
\ No newline at end of file
+{%- endif %}
diff --git a/keepalived/files/keepalived.conf b/keepalived/files/keepalived.conf
index af62535..b00925b 100644
--- a/keepalived/files/keepalived.conf
+++ b/keepalived/files/keepalived.conf
@@ -4,7 +4,7 @@
 
 {% for instance_name, instance in cluster.instance.iteritems() %}
 vrrp_instance {{ instance_name }} {
-    {{%- if instance.get('nopreempt', True) }}
+    {%- if instance.get('nopreempt', True) %}
     state BACKUP
     nopreempt
     garp_master_delay 5
@@ -13,7 +13,7 @@
     {%- else %}
     state MASTER
     {%- endif %}
-    {{%- if instance.notify_action is defined }}
+    {%- if instance.notify_action is defined %}
     notify /usr/local/bin/keepalivednotify_{{ instance_name }}.sh
     {%- endif %}
     interface {{ instance.interface }}
@@ -34,4 +34,4 @@
         {%- endif %}
     }
 }
-{% endfor %}
\ No newline at end of file
+{% endfor %}
diff --git a/keepalived/files/keepalivednotify.sh b/keepalived/files/keepalivednotify.sh
index 7a97b12..2fa7055 100644
--- a/keepalived/files/keepalivednotify.sh
+++ b/keepalived/files/keepalivednotify.sh
@@ -6,11 +6,11 @@
 STATE=$3
 
 case $STATE in
-        "MASTER") {{ instance.notify_cmd.master|indent(19, false) }}
+        "MASTER") {{ instance.notify_action.master|indent(19, false) }}
                   ;;
-        "BACKUP") {{ instance.notify_cmd.backup|indent(19, false) }}
+        "BACKUP") {{ instance.notify_action.backup|indent(19, false) }}
                   ;;
-        "FAULT")  {{ instance.notify_cmd.fault|indent(19, false) }}
+        "FAULT")  {{ instance.notify_action.fault|indent(19, false) }}
                   ;;
         *)        echo "unknown state"
                   exit 1