diff --git a/README.md b/README.md
index 183cf25..cb08406 100644
--- a/README.md
+++ b/README.md
@@ -26,8 +26,8 @@ docker run --rm -p 5000:5000 -it nephatrine/docker-registry:latest /bin/bash
 
 ## Docker Tags
 
-- **nephatrine/docker-registry:testing**: Registry 2.7 / Alpine Edge
-- **nephatrine/docker-registry:latest**: Registry 2.7 / Alpine Latest
+- **nephatrine/docker-registry:testing**: Registry Main / Alpine Edge
+- **nephatrine/docker-registry:latest**: Registry Main / Alpine Latest
 
 ## Configuration Variables
 
diff --git a/override/etc/cont-init.d/01-registry b/override/etc/cont-init.d/01-registry
deleted file mode 100755
index f54184d..0000000
--- a/override/etc/cont-init.d/01-registry
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-if [[ ! -d /mnt/config/etc/registry ]]; then
-  s6-setuidgid guardian mkdir -p /mnt/config/etc/registry
-fi
-s6-setuidgid guardian cp -n /etc/registry/* /mnt/config/etc/registry/
-
-if [[ ! -d ${REGISTRY_DATA_DIR} ]]; then
-  s6-setuidgid guardian mkdir -p ${REGISTRY_DATA_DIR}
-fi
\ No newline at end of file
diff --git a/override/etc/crontabs.custom.d/guardian b/override/etc/crontabs.custom.d/guardian
deleted file mode 100644
index 2b2836a..0000000
--- a/override/etc/crontabs.custom.d/guardian
+++ /dev/null
@@ -1 +0,0 @@
-0	6	*	*	*	/usr/local/bin/clean-registry --delete-untagged=true
diff --git a/override/etc/fix-attrs.d/01-registry b/override/etc/fix-attrs.d/01-registry
deleted file mode 100644
index 94c47ed..0000000
--- a/override/etc/fix-attrs.d/01-registry
+++ /dev/null
@@ -1 +0,0 @@
-/mnt/config/data/docker true guardian:users,1000:100 0644 0755
diff --git a/override/etc/periodic/daily/registry-gc b/override/etc/periodic/daily/registry-gc
new file mode 100755
index 0000000..3f5dba8
--- /dev/null
+++ b/override/etc/periodic/daily/registry-gc
@@ -0,0 +1,3 @@
+#!/bin/bash
+export HOME=/mnt/config/home
+/command/s6-setuidgid guardian /usr/bin/registry garbage-collect --delete-untagged=true /mnt/config/etc/registry/config.yml
diff --git a/override/etc/s6-overlay/s6-rc.d/registry/dependencies.d/guardian_setup b/override/etc/s6-overlay/s6-rc.d/registry/dependencies.d/guardian_setup
new file mode 100644
index 0000000..8d1c8b6
--- /dev/null
+++ b/override/etc/s6-overlay/s6-rc.d/registry/dependencies.d/guardian_setup
@@ -0,0 +1 @@
+ 
diff --git a/override/etc/s6-overlay/s6-rc.d/registry/run b/override/etc/s6-overlay/s6-rc.d/registry/run
new file mode 100755
index 0000000..a8b0e15
--- /dev/null
+++ b/override/etc/s6-overlay/s6-rc.d/registry/run
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Build Config
+
+if [[ ! -d /mnt/config/etc/registry ]]; then
+  /command/s6-setuidgid guardian /bin/mkdir -p /mnt/config/etc/registry
+fi
+/command/s6-setuidgid guardian /bin/cp -n /etc/registry/* /mnt/config/etc/registry/
+
+# Start Service
+
+if [[ ! -d /mnt/config/data ]]; then
+  /command/s6-setuidgid guardian /bin/mkdir -p /mnt/config/data
+fi
+
+export HOME=/mnt/config/home
+exec /command/s6-setuidgid guardian /usr/bin/registry serve /mnt/config/etc/registry/config.yml
diff --git a/override/etc/s6-overlay/s6-rc.d/registry/type b/override/etc/s6-overlay/s6-rc.d/registry/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/override/etc/s6-overlay/s6-rc.d/registry/type
@@ -0,0 +1 @@
+longrun
diff --git a/override/etc/s6-overlay/s6-rc.d/user/contents.d/registry b/override/etc/s6-overlay/s6-rc.d/user/contents.d/registry
new file mode 100644
index 0000000..8d1c8b6
--- /dev/null
+++ b/override/etc/s6-overlay/s6-rc.d/user/contents.d/registry
@@ -0,0 +1 @@
+ 
diff --git a/override/etc/services.d/00-registry/run b/override/etc/services.d/00-registry/run
deleted file mode 100755
index eec3f29..0000000
--- a/override/etc/services.d/00-registry/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/with-contenv sh
-exec s6-setuidgid guardian /usr/bin/registry serve /mnt/config/etc/registry/config.yml
\ No newline at end of file
diff --git a/override/usr/local/bin/clean-registry b/override/usr/local/bin/clean-registry
deleted file mode 100755
index 31c1825..0000000
--- a/override/usr/local/bin/clean-registry
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/with-contenv sh
-/usr/bin/registry garbage-collect /mnt/config/etc/registry/config.yml $@
\ No newline at end of file