diff --git a/.gitignore b/.gitignore
index 45f9d4ef72a..fd407433177 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,30 @@
 /app/etc/local.xml
-/media/catalog
-/media/captcha
-/media/css
-/media/css_secure
-/media/email/logo
-/media/favicon
-/media/js
-/media/sales/store/logo
-/media/sales/store/logo_html
-/media/wysiwyg
+
+# Add a base setup for running unit Tests with code coverage and send them to SonarCloud
+# https://github.com/OpenMage/magento-lts/pull/1836
+/dev/testfield
+/dev/tests/clover.xml
+/dev/tests/crap4j.xml
+/dev/tests/junit.xml
+
+# Add Gitpod online IDE config
+# https://github.com/OpenMage/magento-lts/pull/1836
+/dev/gitpod/docker-magento
+/dev/gitpod/.env
+
+# Add development environment setup files and README
+# https://github.com/OpenMage/magento-lts/pull/1012
+/dev/openmage/docker-magento
+/dev/openmage/.env
 /dev/tests/functional/generated
 /dev/tests/functional/vendor
+
+/media/*
+!/media/.htaccess
+!/media/custom_options/.htaccess
+!/media/customer/.htaccess
+!/media/dhl/logo.jpg
+!/media/downloadable/.htaccess
+
+/var/*
+!/var/.htaccess
diff --git a/dev/.gitignore b/dev/.gitignore
deleted file mode 100644
index b0aeb98d779..00000000000
--- a/dev/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/testfield
-/tests/clover.xml
-/tests/crap4j.xml
-/tests/junit.xml
diff --git a/dev/gitpod/.gitignore b/dev/gitpod/.gitignore
deleted file mode 100644
index db60f9e1563..00000000000
--- a/dev/gitpod/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-docker-magento/
-.env
diff --git a/dev/openmage/.gitignore b/dev/openmage/.gitignore
deleted file mode 100644
index a0f74afad50..00000000000
--- a/dev/openmage/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-docker-magento/
-.env
\ No newline at end of file
diff --git a/var/.gitignore b/var/.gitignore
deleted file mode 100644
index bdbc998087c..00000000000
--- a/var/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-*
-.*
-!package
-!package/*
-!.htaccess
-!.gitignore