diff --git a/cinder/files/backend/_fujitsu.conf b/cinder/files/backend/_fujitsu.conf
index c9e8245..24925f0 100644
--- a/cinder/files/backend/_fujitsu.conf
+++ b/cinder/files/backend/_fujitsu.conf
@@ -2,4 +2,4 @@
 [{{ backend_name }}]
 volume_backend_name={{ backend_name }}
 volume_driver=cinder.volume.drivers.fujitsu.fujitsu_eternus_dx_fc.FJDXFCDriver
-cinder_eternus_config_file=/etc/cinder/cinder_fujitsu_eternus_dx_{{ backend_name }}.xml
\ No newline at end of file
+cinder_eternus_config_file=/etc/cinder/cinder_fujitsu_eternus_dx_{{ backend_name }}.xml
diff --git a/cinder/files/liberty/cinder_fujitsu_eternus_dx.xml b/cinder/files/liberty/cinder_fujitsu_eternus_dx.xml
index 1af35fa..09cd26a 100644
--- a/cinder/files/liberty/cinder_fujitsu_eternus_dx.xml
+++ b/cinder/files/liberty/cinder_fujitsu_eternus_dx.xml
@@ -1,22 +1,10 @@
-{%- if volume.storage.engine is defined %}
-{%- from "cinder/map.jinja" import volume with context -%}
+{%- set backend = salt['pillar.get']('cinder:volume:backend:'+backend_name) -%}
 <?xml version='1.0' encoding='UTF-8'?>
 <FUJITSU>
-<EternusIP>{{ volume.storage.host }}</EternusIP>
-<EternusPort>{{ volume.storage.port }}</EternusPort>
-<EternusUser>{{ volume.storage.user }}</EternusUser>
-<EternusPassword>{{ volume.storage.password }}</EternusPassword>
-<EternusISCSIIP></EternusISCSIIP>
-<EternusPool>{{ volume_type_name }}</EternusPool>
-</FUJITSU>
-{%- else %}
-<?xml version='1.0' encoding='UTF-8'?>
-<FUJITSU>
-<EternusIP>{{ volume.backend.host }}</EternusIP>
-<EternusPort>{{ volume.backend.port }}</EternusPort>
-<EternusUser>{{ volume.backend.user }}</EternusUser>
-<EternusPassword>{{ volume.backend.password }}</EternusPassword>
+<EternusIP>{{ backend.host }}</EternusIP>
+<EternusPort>{{ backend.port }}</EternusPort>
+<EternusUser>{{ backend.user }}</EternusUser>
+<EternusPassword>{{ backend.password }}</EternusPassword>
 <EternusISCSIIP></EternusISCSIIP>
 <EternusPool>{{ backend.pool }}</EternusPool>
 </FUJITSU>
-{%- endif %}
diff --git a/cinder/files/mitaka/cinder_fujitsu_eternus_dx.xml b/cinder/files/mitaka/cinder_fujitsu_eternus_dx.xml
new file mode 100644
index 0000000..09cd26a
--- /dev/null
+++ b/cinder/files/mitaka/cinder_fujitsu_eternus_dx.xml
@@ -0,0 +1,10 @@
+{%- set backend = salt['pillar.get']('cinder:volume:backend:'+backend_name) -%}
+<?xml version='1.0' encoding='UTF-8'?>
+<FUJITSU>
+<EternusIP>{{ backend.host }}</EternusIP>
+<EternusPort>{{ backend.port }}</EternusPort>
+<EternusUser>{{ backend.user }}</EternusUser>
+<EternusPassword>{{ backend.password }}</EternusPassword>
+<EternusISCSIIP></EternusISCSIIP>
+<EternusPool>{{ backend.pool }}</EternusPool>
+</FUJITSU>
diff --git a/cinder/volume.sls b/cinder/volume.sls
index 7245907..46a361b 100644
--- a/cinder/volume.sls
+++ b/cinder/volume.sls
@@ -122,7 +122,7 @@
   - source: salt://cinder/files/{{ volume.version }}/cinder_fujitsu_eternus_dx.xml
   - template: jinja
   - defaults:
-      volume_type_name: "{{ backend.pool }}"
+      backend_name: "{{ backend_name }}"
   - require:
     - pkg: cinder-driver-fujitsu