diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000..df05ec6eb8
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,6 @@
+ansible
+build
+env
+vendor
+CHANGELOG.md
+Vagrantfile
\ No newline at end of file
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..4c2a8ed233
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG.md  merge=union
diff --git a/.gitignore b/.gitignore
index 7369e293f1..6cedd24741 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,8 @@
 .idea
 *.iml
 .vagrant
-.*
+.php_cs.cache
+
 cache.properties
 /nbproject
 build