diff --git a/.gitignore b/.gitignore
index 305a463ba..94ca25c7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-vendor
-
 # Binaries for programs and plugins
 *.exe
 *.exe~
@@ -17,11 +15,13 @@ Dockerfile.cross
 # Output of the go coverage tools
 *.out
 coverage
+cover.out
 
 # Release output
 dist/**
 operator-controller.yaml
 install.sh
+catalogd.yaml
 
 # Kubernetes Generated files - skip generated files, except for vendored files
 
@@ -41,3 +41,11 @@ site
 .tiltbuild/
 .catalogd-tmp/
 .vscode
+
+# Catalogd
+catalogd/bin/
+catalogd/vendor/
+catalogd/dist/
+catalogd/cover.out
+catalogd/catalogd.yaml
+catalogd/install.sh
diff --git a/catalogd/.gitignore b/catalogd/.gitignore
deleted file mode 100644
index 8ee34b8f6..000000000
--- a/catalogd/.gitignore
+++ /dev/null
@@ -1,21 +0,0 @@
-
-# Binaries for programs and plugins
-bin
-
-# Kubernetes Generated files - skip generated files, except for vendored files
-
-!vendor/**/zz_generated.*
-
-# Dependency directories
-vendor/
-bin/
-dist/
-cover.out
-
-# Release output
-catalogd.yaml
-install.sh
-
-.tiltbuild/
-.vscode
-.idea