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 d1f786b..ec5fd1b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,12 @@
 FROM quay.io/thallian/confd-env:latest
 
-ENV VERSION v0.18.7-rc2
+ENV VERSION v0.18.7
 
 RUN addgroup -g 2222 synapse
 RUN adduser -h /var/lib/synapse -u 2222 -D -G synapse synapse
 
 RUN apk add --no-cache \
-    openssl \
+    libressl \
     bash \
     coreutils \
     curl \
@@ -28,12 +28,12 @@ RUN apk add --no-cache \
     make \
     musl \
     musl-dev \
-    openssl-dev \
+    libressl-dev \
     pwgen \
-    py-pip \
+    py2-pip \
     py-virtualenv \
-    python \
-    python-dev \
+    python2 \
+    python2-dev \
     sqlite \
     sqlite-libs \
     unzip \
@@ -59,7 +59,7 @@ RUN apk del \
     linux-headers \
     make \
     musl-dev \
-    openssl-dev \
+    libressl-dev \
     python-dev \
     sqlite-libs \
     zlib-dev