diff --git a/docker-compose.yml b/etc/drone/docker-compose.yml
similarity index 100%
rename from docker-compose.yml
rename to etc/drone/docker-compose.yml
diff --git a/runner-docker.env b/etc/drone/runner-docker.env
similarity index 100%
rename from runner-docker.env
rename to etc/drone/runner-docker.env
diff --git a/server.env b/etc/drone/server.env
similarity index 100%
rename from server.env
rename to etc/drone/server.env
diff --git a/drone.service b/etc/systemd/system/drone.service
similarity index 88%
rename from drone.service
rename to etc/systemd/system/drone.service
index 49be087..01a80be 100644
--- a/drone.service
+++ b/etc/systemd/system/drone.service
@@ -41,9 +41,4 @@ SystemCallArchitectures=native
 [Install]
 WantedBy=multi-user.target
 
-# /etc/systemd/system/drone.service.d/override.conf
-# drone service override
-# [Unit]
-# OnFailure=status_email_wanderer@%n
-
 # vim: ft=systemd
diff --git a/etc/systemd/system/drone.service.d/override.conf b/etc/systemd/system/drone.service.d/override.conf
new file mode 100644
index 0000000..6139395
--- /dev/null
+++ b/etc/systemd/system/drone.service.d/override.conf
@@ -0,0 +1,6 @@
+# /etc/systemd/system/drone.service.d/override.conf
+# drone service override
+[Unit]
+OnFailure=status_email_wanderer@%n
+
+# vim: ft=systemd
diff --git a/drone.slice b/etc/systemd/system/drone.slice
similarity index 100%
rename from drone.slice
rename to etc/systemd/system/drone.slice