diff --git a/Dockerfile b/Dockerfile
index 761ca018..3b12962f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@
 FROM ubuntu:16.04
 LABEL author=frappé
 
-# Generate locale C.UTF-8 for mariadb and general locale data
+# Set locale C.UTF-8 for mariadb and general locale data
 ENV LANG C.UTF-8
 
 # Install all neccesary packages
@@ -31,7 +31,7 @@ COPY --chown=frappe:frappe ./frappe-bench /home/frappe/frappe-bench
 
 USER root
 # Install bench
-RUN pip install -e git+https://github.com/frappe/bench.git \
+RUN pip install -e git+https://github.com/frappe/bench.git#egg=bench \
   && rm -rf ~/.cache/pip
 
 USER frappe
diff --git a/conf/mariadb-conf.d/my.cnf b/conf/mariadb-conf.d/my.cnf
index 7864c7e6..5b99beba 100644
--- a/conf/mariadb-conf.d/my.cnf
+++ b/conf/mariadb-conf.d/my.cnf
@@ -27,3 +27,12 @@ collation-server = utf8mb4_unicode_ci
 
 [mysql]
 default-character-set = utf8mb4
+
+[mysqld_safe]
+skip_log_error
+syslog
+
+[mysqldump]
+quick
+quote-names
+max_allowed_packet	= 16M
diff --git a/conf/mariadb-conf.d/mysql.cnf b/conf/mariadb-conf.d/mysql.cnf
deleted file mode 100644
index b4a7402c..00000000
--- a/conf/mariadb-conf.d/mysql.cnf
+++ /dev/null
@@ -1,2 +0,0 @@
-[mysql]
-
diff --git a/conf/mariadb-conf.d/mysqld_safe_syslog.cnf b/conf/mariadb-conf.d/mysqld_safe_syslog.cnf
deleted file mode 100644
index c09bd0ed..00000000
--- a/conf/mariadb-conf.d/mysqld_safe_syslog.cnf
+++ /dev/null
@@ -1,4 +0,0 @@
-[mysqld_safe]
-skip_log_error
-syslog
-
diff --git a/conf/mariadb-conf.d/mysqldump.cnf b/conf/mariadb-conf.d/mysqldump.cnf
deleted file mode 100644
index d9d88acd..00000000
--- a/conf/mariadb-conf.d/mysqldump.cnf
+++ /dev/null
@@ -1,5 +0,0 @@
-[mysqldump]
-quick
-quote-names
-max_allowed_packet	= 16M
-
diff --git a/conf/redis-conf.d/pids/redis_cache.pid b/conf/redis-conf.d/pids/redis_cache.pid
deleted file mode 100644
index 209e3ef4..00000000
--- a/conf/redis-conf.d/pids/redis_cache.pid
+++ /dev/null
@@ -1 +0,0 @@
-20
diff --git a/conf/redis-conf.d/pids/redis_queue.pid b/conf/redis-conf.d/pids/redis_queue.pid
deleted file mode 100644
index a45fd52c..00000000
--- a/conf/redis-conf.d/pids/redis_queue.pid
+++ /dev/null
@@ -1 +0,0 @@
-24
diff --git a/conf/redis-conf.d/pids/redis_socketio.pid b/conf/redis-conf.d/pids/redis_socketio.pid
deleted file mode 100644
index f04c001f..00000000
--- a/conf/redis-conf.d/pids/redis_socketio.pid
+++ /dev/null
@@ -1 +0,0 @@
-29
diff --git a/docker-compose.yml b/docker-compose.yml
index c6e3cade..5968882b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.3'
+version: '3.7'
 services:
   mariadb:
     image: mariadb