diff --git a/Dockerfile b/Dockerfile
index 5050680..c82d782 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,14 +10,7 @@ ENV LANG=C.UTF-8
 # Register pseudo-entrypoint
 ADD ./entrypoint.sh /
 RUN chmod a+x /entrypoint.sh
-CMD ["/entrypoint.sh"]
-
-# Set "real" entrypoint to an init system.
-# TODO: Replace with --init when docker 18.06 is GA
-ENV TINI_VERSION v0.18.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
-RUN chmod +x /tini
-ENTRYPOINT ["/tini", "--"]
+ENTRYPOINT ["/entrypoint.sh"]
 
 # Get build dependencies
 RUN \
diff --git a/docker-compose.m4 b/docker-compose.m4
index d3c445d..22f286d 100644
--- a/docker-compose.m4
+++ b/docker-compose.m4
@@ -7,7 +7,7 @@ define(<env_inline>, <${upcase($1):?upcase($1)}>)
 define(<env_inline_fb>, <${upcase($1):-$2}>)
 
 {
-  "version": "3",
+  "version": "3.7",
 
   ifdef(<__DOCKER_NETWORK>, <
     "networks": {
@@ -91,6 +91,7 @@ define(<env_inline_fb>, <${upcase($1):-$2}>)
           "env_fb(<pleroma_uploads_path>, </uploads>)"
         ]
       },
+      "init": true,
       "restart": "unless-stopped",
       "links": [
         ifelse(__SCRIPT_DEPLOY_POSTGRES, true, <"db">)