diff --git a/backupninja/files/dup.conf b/backupninja/files/dup.conf
index 05ee5a0..d922bd5 100644
--- a/backupninja/files/dup.conf
+++ b/backupninja/files/dup.conf
@@ -148,7 +148,7 @@
 ## if incremental = no, perform a full backup in order to start a new backup set
 ##
 ## Default:
-incremental = {% if source.target.incremental|default(True) %}yes{% else %}no{% endif %}
+incremental = {% if client.target.incremental|default(True) %}yes{% else %}no{% endif %}
 
 ## how many days of incremental backups before doing a full backup again ;
 ## default is 30 days (one can also use the time format of duplicity).
@@ -156,14 +156,14 @@
 ## only perform incremental backups.
 ##
 ## Default:
-increments = {{ if source.target.increments|default(30) }}
+increments = {{ client.target.increments|default(30) }}
 
 ## how many days of data to keep ; default is 60 days.
 ## (you can also use the time format of duplicity)
 ## 'keep = yes' means : do not delete old data, the remote host will take care of this
 ##
 ## Default:
-keep = {{ source.target.keep|default(60) }}
+keep = {{ client.target.keep|default(60) }}
 
 # for how many full backups do we keep their later increments ;
 # default is all (keep all increments).
diff --git a/backupninja/files/handler/mysql.conf b/backupninja/files/handler/mysql.conf
index 97b3089..18a4fff 100644
--- a/backupninja/files/handler/mysql.conf
+++ b/backupninja/files/handler/mysql.conf
@@ -1,6 +1,6 @@
-{%- if pillar.galera.master is defined %}
+{%- if pillar.get("galera", {}).master is defined %}
     {%- from "galera/map.jinja" import master with context -%}
-{%- elif pillar.galera.slave is defined %}
+{%- elif pillar.get("galera", {}).slave is defined %}
     {%- from "galera/map.jinja" import slave with context -%}
 {%- else -%}
     {%- from "mysql/map.jinja" import server with context -%}