diff --git a/README.rst b/README.rst
index 489c455..71739b6 100644
--- a/README.rst
+++ b/README.rst
@@ -135,7 +135,7 @@
         common:
           cloudprovider:
             enabled: True
-            type: openstack
+            provider: openstack
             params:
               auth_url: https://openstack.mydomain:5000/v3
               username: nova
diff --git a/kubernetes/_common.sls b/kubernetes/_common.sls
index 5e6576a..756a19a 100644
--- a/kubernetes/_common.sls
+++ b/kubernetes/_common.sls
@@ -131,7 +131,7 @@
 /etc/kubernetes/config:
   file.absent
 
-{%- if common.get('cloudprovider', {}).get('enabled') and common.get('cloudprovider', {}).get('provider') == "openstack" %}
+{%- if common.get('cloudprovider', {}).get('enabled') and common.get('cloudprovider', {}).get('provider') == 'openstack' %}
 /etc/kubernetes/cloud-config.conf:
   file.managed:
   - source: salt://kubernetes/files/cloudprovider/cloud-config.conf
diff --git a/kubernetes/files/kubelet/default.master b/kubernetes/files/kubelet/default.master
index b45dfa1..398fb20 100644
--- a/kubernetes/files/kubelet/default.master
+++ b/kubernetes/files/kubelet/default.master
@@ -12,9 +12,9 @@
 --v={{ master.get('verbosity', 2) }} \
 --node-labels=node-role.kubernetes.io/master=true \
 {%- if common.get('cloudprovider', {}).get('enabled') %}
-        --cloud-provider={{ common.cloudprovider.provider }} \
-{%- if common.get('cloudprovider', {}).get('provider') == "openstack" %}
-        --cloud-config=/etc/kubernetes/cloud-config.conf \
+--cloud-provider={{ common.cloudprovider.provider }} \
+{%- if common.get('cloudprovider', {}).get('provider') == 'openstack' %}
+--cloud-config=/etc/kubernetes/cloud-config.conf \
 {%- endif %}
 {%- endif %}
 {%- for key, value in master.get('kubelet', {}).get('daemon_opts', {}).iteritems() %}
diff --git a/kubernetes/files/kubelet/default.pool b/kubernetes/files/kubelet/default.pool
index 2be3ed3..496854a 100644
--- a/kubernetes/files/kubelet/default.pool
+++ b/kubernetes/files/kubelet/default.pool
@@ -19,9 +19,9 @@
 {%- endif %}
 --file-check-frequency={{ pool.kubelet.frequency }} \
 {%- if common.get('cloudprovider', {}).get('enabled') %}
-        --cloud-provider={{ common.cloudprovider.provider }} \
-{%- if common.get('cloudprovider', {}).get('provider') == "openstack" %}
-        --cloud-config=/etc/kubernetes/cloud-config.conf \
+--cloud-provider={{ common.cloudprovider.provider }} \
+{%- if common.get('cloudprovider', {}).get('provider') == 'openstack' %}
+--cloud-config=/etc/kubernetes/cloud-config.conf \
 {%- endif %}
 {%- endif %}
 {%- if common.addons.get('virtlet', {}).get('enabled') %}
diff --git a/kubernetes/files/virtlet/kubelet.conf b/kubernetes/files/virtlet/kubelet.conf
index 189c559..2697cc3 100644
--- a/kubernetes/files/virtlet/kubelet.conf
+++ b/kubernetes/files/virtlet/kubelet.conf
@@ -29,7 +29,7 @@
     "cgroupsPerQOS": true,
 {%- if common.get('cloudprovider', {}).get('enabled') %}
     "cloudProvider": "{{ common.cloudprovider.provider }}"
-{%- if common.get('cloudprovider', {}).get('provider') == "openstack" %}
+{%- if common.get('cloudprovider', {}).get('provider') == 'openstack' %}
     "cloudConfigFile": "/etc/kubernetes/cloud-config.conf",
 {%- endif %}
 {%- else %}
diff --git a/kubernetes/master/controller.sls b/kubernetes/master/controller.sls
index b6ff495..4bfb35b 100644
--- a/kubernetes/master/controller.sls
+++ b/kubernetes/master/controller.sls
@@ -108,7 +108,7 @@
 {%- endif %}
 {%- if common.get('cloudprovider', {}).get('enabled') %}
         --cloud-provider={{ common.cloudprovider.provider }}
-{%- if common.get('cloudprovider', {}).get('provider') == "openstack" %}
+{%- if common.get('cloudprovider', {}).get('provider') == 'openstack' %}
         --cloud-config=/etc/kubernetes/cloud-config.conf
 {%- endif %}
 {%- endif %}
@@ -145,7 +145,7 @@
         --service-account-private-key-file=/etc/kubernetes/ssl/kubernetes-server.key
 {%- if common.get('cloudprovider', {}).get('enabled') %}
         --cloud-provider={{ common.cloudprovider.provider }}
-{%- if common.get('cloudprovider', {}).get('provider') == "openstack" %}
+{%- if common.get('cloudprovider', {}).get('provider') == 'openstack' %}
         --cloud-config=/etc/kubernetes/cloud-config.conf
 {%- endif %}
 {%- endif %}