diff --git a/galera/files/debian.cnf b/galera/files/debian.cnf
index e1b543b..dd1e6fa 100644
--- a/galera/files/debian.cnf
+++ b/galera/files/debian.cnf
@@ -1,8 +1,8 @@
-{%- if pillar.galera.master is defined %}
+{%- if pillar.galera.get('master',{}).get('enabled', False) %}
 {%- from "galera/map.jinja" import master with context %}
 {%- set service = master %}
 {%- endif %}
-{%- if pillar.galera.slave is defined %}
+{%- if pillar.galera.get('slave',{}).get('enabled', False) %}
 {%- from "galera/map.jinja" import slave with context %}
 {%- set service = slave %}
 {%- endif %}
diff --git a/galera/files/my.cnf b/galera/files/my.cnf
index 7cf3f10..ea04def 100644
--- a/galera/files/my.cnf
+++ b/galera/files/my.cnf
@@ -1,11 +1,11 @@
 # All files in this package is subject to the GPL v2 license
 # More information is in the COPYING file in the top directory of this package.
 # Copyright (C) 2011 severalnines.com
-{%- if pillar.galera.master is defined %}
+{%- if pillar.galera.get('master',{}).get('enabled', False) %}
 {%- from "galera/map.jinja" import master with context %}
 {%- set service = master %}
 {%- endif %}
-{%- if pillar.galera.slave is defined %}
+{%- if pillar.galera.get('slave',{}).get('enabled', False) %}
 {%- from "galera/map.jinja" import slave with context %}
 {%- set service = slave %}
 {%- endif %}
diff --git a/galera/files/my.cnf.container b/galera/files/my.cnf.container
index dc09937..0a2645e 100644
--- a/galera/files/my.cnf.container
+++ b/galera/files/my.cnf.container
@@ -1,4 +1,4 @@
-{%- if pillar.galera.master is defined %}
+{%- if pillar.galera.get('master',{}).get('enabled', False) %}
 {%- from "galera/map.jinja" import master with context %}
 {%- set service = master %}
 {%- endif %}
@@ -79,4 +79,4 @@
 [xtrabackup]
 parallel=4
 user={{ service.admin.user }}
-password={{ service.admin.password }}
\ No newline at end of file
+password={{ service.admin.password }}
diff --git a/galera/files/my.cnf.init b/galera/files/my.cnf.init
index 1d95bce..9b0a0c1 100644
--- a/galera/files/my.cnf.init
+++ b/galera/files/my.cnf.init
@@ -1,11 +1,11 @@
 # All files in this package is subject to the GPL v2 license
 # More information is in the COPYING file in the top directory of this package.
 # Copyright (C) 2011 severalnines.com
-{%- if pillar.galera.master is defined %}
+{%- if pillar.galera.get('master',{}).get('enabled', False) %}
 {%- from "galera/map.jinja" import master with context %}
 {%- set service = master %}
 {%- endif %}
-{%- if pillar.galera.slave is defined %}
+{%- if pillar.galera.get('slave',{}).get('enabled', False) %}
 {%- from "galera/map.jinja" import slave with context %}
 {%- set service = slave %}
 {%- endif %}