diff --git a/README.md b/README.md
index 038776ec84..2e9b6c974a 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ policy may be made to more closely align with other providers in the Cluster API
    ```
 
    `<clouds.yaml>` is a yaml file to record how to interact with openstack cloud, there's a sample
-   [clouds.yaml](pkg/cloud/openstack/clients/clouds.yaml), and [openclient configuration files](https://docs.openstack.org/python-openstackclient/latest/configuration/index.html#configuration-files) has additional information.
+   [clouds.yaml](pkg/cloud/openstack/services/clouds.yaml), and [OpenStackClient configuration files](https://docs.openstack.org/python-openstackclient/latest/configuration/index.html#configuration-files) has additional information.
 
    `<openstack cloud>` is the cloud you are going to use, e.g. multiple cloud might be defined in `clouds.yaml`
    and this will be cloud to be used for the new kubernetes to interact with.
@@ -116,6 +116,8 @@ policy may be made to more closely align with other providers in the Cluster API
        region_name: RegionOne
    ```
 
+   In case your OpenStack cluster endpoint is using SSL and the cert is signed by an unknown CA, a specific cacert can be provided via cacert.
+
    `<provider os>` specifies the operating system of the virtual machines Kubernetes will run on.
    Supported Operating Systems:
    - `centos`
diff --git a/cmd/clusterctl/examples/openstack/provider-component/user-data/coreos/templates/master.yaml b/cmd/clusterctl/examples/openstack/provider-component/user-data/coreos/templates/master.yaml
index 7b1049cea1..25355c9529 100644
--- a/cmd/clusterctl/examples/openstack/provider-component/user-data/coreos/templates/master.yaml
+++ b/cmd/clusterctl/examples/openstack/provider-component/user-data/coreos/templates/master.yaml
@@ -85,7 +85,7 @@ storage:
   - path: /etc/kubernetes/kubeadm_config.yaml
     filesystem: root
     contents:
-      inline: '{{ .KubeadmConfig | EscapeNewLines }}'
+      inline: "{{ .KubeadmConfig | EscapeNewLines }}"
     user:
       id: 0
     group:
@@ -111,7 +111,7 @@ systemd:
   - name: kubeadm.service
     contents: |-
       [Unit]
-      Description=Initialise bootkube master.
+      Description=Initialise Kubernetes control plane node.
       After=kubelet.service
       Requires=coreos-metadata.service
 
diff --git a/cmd/clusterctl/examples/openstack/provider-component/user-data/coreos/templates/worker.yaml b/cmd/clusterctl/examples/openstack/provider-component/user-data/coreos/templates/worker.yaml
index b5a013994d..168f528234 100644
--- a/cmd/clusterctl/examples/openstack/provider-component/user-data/coreos/templates/worker.yaml
+++ b/cmd/clusterctl/examples/openstack/provider-component/user-data/coreos/templates/worker.yaml
@@ -3,7 +3,7 @@ storage:
   - path: /etc/kubernetes/kubeadm_config.yaml
     filesystem: root
     contents:
-      inline: '{{ .KubeadmConfig | EscapeNewLines }}'
+      inline: "{{ .KubeadmConfig | EscapeNewLines }}"
     user:
       id: 0
     group:
@@ -14,7 +14,7 @@ systemd:
   - name: kubeadm.service
     contents: |-
       [Unit]
-      Description=Initialise bootkube master.
+      Description=Initialise Kubernetes worker node.
       After=kubelet.service
       Requires=coreos-metadata.service