diff --git a/.gitattributes b/.gitattributes
index a02fd8a1785..538ef2a13b9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,11 @@
 # On Windows the wrong line endings break docker containers
 # Article: https://help.github.com/articles/dealing-with-line-endings/
-* text eol=lf
+* text=auto
+/containers text eol=lf
+.gitignore text
 *.png binary
 *.jpg binary
+*.tqr binary
+*gz binary
+*MY? binary
 
diff --git a/.gitignore b/.gitignore
index de7a33d6834..250240df8c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,16 @@
-# Temporary build-tools artifacts to be ignored
-/.go/
-/.gotmp/
-/bin/
-/.container*
-/.push*
-/linux
-/darwin
-/windows
-/.dockerfile
-/VERSION.txt
-/.docker_image
-/debug
-/debug.test
-
-/.idea
+# Temporary build-tools artifacts to be ignored
+/.go/
+/.gotmp/
+/bin/
+/.container*
+/.push*
+/linux
+/darwin
+/windows
+/.dockerfile
+/VERSION.txt
+/.docker_image
+/debug
+/debug.test
+
+/.idea