diff --git a/Dockerfile b/Dockerfile
--- a/Dockerfile
+++ b/Dockerfile
@@ -114,4 +114,4 @@
 EXPOSE 80
 EXPOSE 443
 
-CMD ["/usr/local/sbin/runsvdir-init"]
+CMD ["/usr/bin/runsvdir", "-P", "/etc/service"]
diff --git a/files/etc/service/nginx/run b/files/etc/service/nginx/run
--- a/files/etc/service/nginx/run
+++ b/files/etc/service/nginx/run
@@ -1,4 +1,3 @@
 #!/bin/bash
 exec 2>&1
-source /usr/local/etc/envvars
 exec /usr/sbin/nginx
diff --git a/files/etc/service/php-fpm/run b/files/etc/service/php-fpm/run
--- a/files/etc/service/php-fpm/run
+++ b/files/etc/service/php-fpm/run
@@ -1,5 +1,4 @@
 #!/bin/bash
 exec 2>&1
-source /usr/local/etc/envvars
 php-fpm-env > /usr/local/etc/php-fpm-env.conf
 exec /usr/local/sbin/php-fpm --nodaemonize
diff --git a/files/usr/local/sbin/runsvdir-init b/files/usr/local/sbin/runsvdir-init
deleted file mode 100755
--- a/files/usr/local/sbin/runsvdir-init
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-export > /usr/local/etc/envvars
-exec /usr/sbin/runsvdir-start