diff --git a/.gitignore b/.gitignore
index 18225c156201..372634cfb016 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,31 @@
-deps/
-dockers/*/files/
-*.bin
-*.deb
-*.zip
+# Build system related
+.platform
+
+# Build artifacts
 fsroot/
 fs.*
-src/hiredis/hiredis_*
-src/hiredis/hiredis-*/
-src/quagga/quagga_*
-src/quagga/quagga/
-src/initramfs-tools/initramfs-tools/
-src/redis/redis_*
-src/redis/redis-*/
+target/
+
+# Subdirectories in src
+src/hiredis/*
+!src/hiredis/Makefile
+src/initramfs-tools/*
+!src/initramfs-tools/Makefile
+src/redis/*
+!src/redis/Makefile
+src/libnl3/*
+!src/libnl3/Makefile
+src/libteam/*
+!src/libteam/Makefile
+src/snmpd/*
+!src/snmpd/Makefile
+src/thrift/*
+!src/thrift/Makefile
+
+# Autogenerated Dockerfiles
+dockers/docker-database/Dockerfile
+dockers/docker-fpm/Dockerfile
+dockers/docker-lldp-sv2/Dockerfile
+dockers/docker-orchagent/Dockerfile
+dockers/docker-snmp-sv2/Dockerfile
+dockers/docker-team/Dockerfile