diff --git a/.dockerignore b/.dockerignore
index 59eaaa3d31..fa9e087b49 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,7 @@
-.git/
-.github/
+.git
+.github
 .vscode
+
 .dockerignore
 .gitignore
 .golangci.yml
@@ -11,8 +12,24 @@ hack/tools/bin/
 out/
 docs/
 scripts/
-**/.md
+**/*.md
 *.test
 cluster-api-provider-vsphere
 examples/provider-components/provider-components*.yaml
 test/
+
+# go.work files
+go.work
+go.work.sum
+
+# Test binary, build with `go test -c`
+**/*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+**/*.out
+
+# Common editor / temporary files
+**/*~
+**/*.tmp
+**/.DS_Store
+**/*.swp
diff --git a/.gitignore b/.gitignore
index 134102d9b1..1ada11246d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,9 +32,26 @@ envvars.txt
 # Test binary, build with `go test -c`
 *.test
 
+
+# Output of Makefile targets using sed on MacOS systems
+*.yaml-e
+
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 
+# IntelliJ
+.idea/
+*.iml
+
+# VSCode
+.vscode/
+*.code-workspace
+
+# go.work files
+go.work
+go.work.sum
+
+# kubeconfigs
 minikube.kubeconfig
 config/base/vsphere_tmp.pub
 config/base/vsphere_tmp
@@ -66,11 +83,6 @@ _releasenotes
 # Ignore the kubeconfig file generated by clusterctl
 /kubeconfig
 
-# Ignore Goland files
-.idea/
-
-.build
-.tiltbuild
 
 # Common editor / temporary files
 *~
@@ -80,3 +92,9 @@ _releasenotes
 
 # Ginkgo logs from test runs
 *ginkgo-log.txt
+
+# User-supplied Tiltfile extensions, settings, and builds
+tilt.d
+tilt-settings.json
+tilt-settings.yaml
+.tiltbuild