diff --git a/cinder/controller.sls b/cinder/controller.sls
index 6ee10e1..fc39ebb 100644
--- a/cinder/controller.sls
+++ b/cinder/controller.sls
@@ -341,6 +341,9 @@
   cinderng.volume_type_present:
   - name: {{ backend.type_name }}
   - profile: {{ credentials }}
+  {%- if controller.get('role', 'primary') == 'secondary' %}
+  - onlyif: /bin/false
+  {%- endif %}
   - require:
     - service: cinder_controller_services
 
@@ -350,6 +353,9 @@
   - key: volume_backend_name
   - value: {{ backend_name }}
   - profile: {{ credentials }}
+  {%- if controller.get('role', 'primary') == 'secondary' %}
+  - onlyif: /bin/false
+  {%- endif %}
   - require:
     - cinderng: cinder_type_create_{{ backend_name }}
 
diff --git a/cinder/files/backend/_ceph.conf b/cinder/files/backend/_ceph.conf
index 4e06c34..8d4a8db 100644
--- a/cinder/files/backend/_ceph.conf
+++ b/cinder/files/backend/_ceph.conf
@@ -1,6 +1,10 @@
 
 [{{ backend_name }}]
+{%- if backend.get('backend_host', False) %}
+backend_host={{ backend.backend_host }}
+{%- else %}
 host={{ backend.get('host', grains.host) }}
+{%- endif %}
 volume_backend_name={{ backend_name }}
 volume_driver = cinder.volume.drivers.rbd.RBDDriver
 #
diff --git a/debian/changelog b/debian/changelog
index a14efad..c058524 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+salt-formula-cinder (2016.12.1) xenial; urgency=medium
+
+  * Switch using 3.0 native source format
+
+ -- devops <devops@mirantis.com>  Fri, 10 Aug 2018 15:45:04 +0400
+
 salt-formula-cinder (2016.12.1-2xenial1) xenial; urgency=medium
 
   * Add preinst, postinst, postrm procedures to process files/pike symlink
diff --git a/debian/source/format b/debian/source/format
index 163aaf8..89ae9db 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)