diff --git a/.gitignore b/.gitignore
index 2dc24ee60eff..42185957f608 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 /gcs*.json
 
 # Do not commit any of the binaries that may be generated at the root.
-/clusterctl*
+/clusterctl
 /cluster-api-provider-vsphere*
 
 # Generated files
@@ -54,3 +54,6 @@ out/
 
 # Ignore the kubeconfig file generated by clusterctl
 /kubeconfig
+
+# Ignore Goland files
+.idea/
diff --git a/clusterctl-settings.yaml b/clusterctl-settings.yaml
new file mode 100644
index 000000000000..2649e0bd7fa9
--- /dev/null
+++ b/clusterctl-settings.yaml
@@ -0,0 +1,8 @@
+{
+  "name": "vsphere",
+  "config": {
+    "componentsFile": "infrastructure-components.yaml",
+    "nextVersion": "v0.6.0",
+    "type": "InfrastructureProvider"
+  }
+}