diff --git a/README.rst b/README.rst
index 1a535a7..a54683b 100644
--- a/README.rst
+++ b/README.rst
@@ -536,6 +536,8 @@
             san_password: password
             clustername: cluster1
             sf_emulate_512: false
+            sf_api_port: 14443
+            host: ctl01
 
 Cinder setup with Block Device driver
 
diff --git a/cinder/files/backend/_solidfire.conf b/cinder/files/backend/_solidfire.conf
index e0b8ab1..5a76c70 100644
--- a/cinder/files/backend/_solidfire.conf
+++ b/cinder/files/backend/_solidfire.conf
@@ -1,9 +1,16 @@
 
 [{{ backend_name }}]
+{%- if (pillar.cinder.get('volume', {}).get('version', '') == 'juno') or (pillar.cinder.get('controller', {}).get('version', '') == 'juno') %}
 host={{ backend.get('host', grains.host) }}
+{%- else %}
+backend_host={{ backend.get('host', grains.host) }}
+{%- endif %}
 volume_backend_name={{ backend_name }}
 san_ip={{ backend.san_ip }}
 san_login={{ backend.san_login }}
 san_password={{ backend.san_password }}
 sf_emulate_512={{ backend.sf_emulate_512 }}
-volume_driver=cinder.volume.drivers.solidfire.SolidFireDriver
\ No newline at end of file
+{%- if backend.sf_api_port is defined %}
+sf_api_port = {{ backend.get('sf_api_port', 443) }}
+{%- endif %}
+volume_driver=cinder.volume.drivers.solidfire.SolidFireDriver
diff --git a/tests/pillar/solidfire_single.sls b/tests/pillar/solidfire_single.sls
index 4ce427d..ecb5982 100644
--- a/tests/pillar/solidfire_single.sls
+++ b/tests/pillar/solidfire_single.sls
@@ -11,6 +11,7 @@
         san_password: password
         clustername: cluster1
         sf_emulate_512: false
+        sf_api_port: 15443
     identity:
       engine: keystone
       host: 127.0.0.1