diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..d741e40
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4
diff --git a/Dockerfile b/Dockerfile
index 6209869..8d9e479 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,13 @@
 FROM quay.io/thallian/php7-fpm:latest
 
-RUN apk add --no-cache openssl tar nginx postgresql-client aspell rsyslog ca-certificates
-
-RUN apk add --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/main/ --allow-untrusted \
-    libressl2.4-libcrypto \
-    libressl2.4-libssl
-
-RUN apk add --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/community/ --allow-untrusted \
+RUN apk add --no-cache \
+    libressl \
+    tar \
+    nginx \
+    postgresql-client \
+    aspell \
+    rsyslog \
+    ca-certificates \
     php7 \
     php7-imap \
     php7-dom \
@@ -26,7 +27,7 @@ RUN apk add --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/comm
     php7-ldap \
     php7-pspell \
     php7-apcu
-    
+
 RUN ln -s /usr/bin/php7 /usr/bin/php
 
 RUN mkdir /var/lib/roundcube