diff --git a/contrib/release-dokku b/contrib/release-dokku
index f88f01a92..a3d2e2443 100755
--- a/contrib/release-dokku
+++ b/contrib/release-dokku
@@ -215,6 +215,8 @@ fn-repo-update() {
   fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/getting-started/installation.md
   fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/template.html
   fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" README.md
+  fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" Dockerfile
+  fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/getting-started/install/docker.md
 
   if [[ "$RELEASE" == 'patch' ]]; then
     fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/assets/versions.json
diff --git a/docker/etc/my_init.d/10_directories b/docker/etc/my_init.d/10_dokku_init
similarity index 68%
rename from docker/etc/my_init.d/10_directories
rename to docker/etc/my_init.d/10_dokku_init
index 3b7926bc8..3d253fce5 100755
--- a/docker/etc/my_init.d/10_directories
+++ b/docker/etc/my_init.d/10_dokku_init
@@ -31,6 +31,17 @@ main() {
       find "$dir" -print0 | xargs -0 chown -h dokku:dokku
     fi
   done
+
+  if [[ -f /mount/plugin-list ]]; then
+    while read line; do
+      dokku plugin:install "$(echo "$line" | awk '{print $2}')" "$(echo "$line" | cut -d':' -f1)"
+    done </mount/plugin-list
+  fi
+
+  if [[ -n "$DOKKU_HOSTNAME" ]]; then
+    echo "dokku dokku/vhost_enable boolean true" | debconf-set-selections
+    dokku --quiet domains:set-global "$DOKKU_HOSTNAME"
+  fi
 }
 
 main "$@"
diff --git a/docker/etc/runit/runsvdir/default/dokku-init/run b/docker/etc/runit/runsvdir/default/dokku-init/run
deleted file mode 100755
index 45056db57..000000000
--- a/docker/etc/runit/runsvdir/default/dokku-init/run
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-exec >> /var/log/services/dokku-init
-exec 2>&1
-
-echo "Running dokku-init"
-cd /tmp || exit 1
-
-if [[ -f /mount/plugin-list ]]; then
-  while read line; do
-    dokku plugin:install "$(echo "$line" | awk '{print $2}')" "$(echo "$line" | cut -d':' -f1)"
-  done </mount/plugin-list
-fi
-
-if [[ -n "$DOKKU_HOSTNAME" ]]; then
-  echo "dokku dokku/vhost_enable boolean true" | debconf-set-selections
-  dokku --quiet domains:set-global "$DOKKU_HOSTNAME"
-fi
-
-exec dokku ps:restore
diff --git a/docker/etc/runit/runsvdir/default/dokku-init/finish b/docker/etc/runit/runsvdir/default/dokku-restore/finish
similarity index 60%
rename from docker/etc/runit/runsvdir/default/dokku-init/finish
rename to docker/etc/runit/runsvdir/default/dokku-restore/finish
index bb8dd40d8..92f49a93d 100755
--- a/docker/etc/runit/runsvdir/default/dokku-init/finish
+++ b/docker/etc/runit/runsvdir/default/dokku-restore/finish
@@ -4,12 +4,12 @@ exec >> /var/log/services/dokku-restore
 exec 2>&1
 
 if [[ "$1" -ne 0 ]]; then
-  echo "Error initializing dokku! Retrying in 30 seconds..."
+  echo "Error restoring dokku apps! Retrying in 30 seconds..."
   exec sleep 30
   exit 0
 fi
 
-echo "Done initializing dokku."
+echo "Done restoring dokku apps."
 exec sleep infinity
 
 exit 0
diff --git a/docker/etc/runit/runsvdir/default/dokku-restore/run b/docker/etc/runit/runsvdir/default/dokku-restore/run
new file mode 100755
index 000000000..58b368a31
--- /dev/null
+++ b/docker/etc/runit/runsvdir/default/dokku-restore/run
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+exec >> /var/log/services/dokku-restore
+exec 2>&1
+
+echo "Running dokku-restore"
+cd /tmp || exit 1
+
+exec dokku ps:restore