diff --git a/beeper/etc/containers/systemd/caddy/.gitkeep b/beeper/etc/containers/systemd/caddy/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/beeper/etc/containers/systemd/mastodon/.gitkeep b/beeper/etc/containers/systemd/mastodon/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/beeper/etc/containers/systemd/postgresql/.gitkeep b/beeper/etc/containers/systemd/postgresql/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/beeper/etc/containers/networks/postgresql.network b/beeper/etc/containers/systemd/postgresql/postgresql.network
similarity index 100%
rename from beeper/etc/containers/networks/postgresql.network
rename to beeper/etc/containers/systemd/postgresql/postgresql.network
diff --git a/beeper/etc/containers/systemd/sharkey-activity.container b/beeper/etc/containers/systemd/sharkey/sharkey-activity.container
similarity index 100%
rename from beeper/etc/containers/systemd/sharkey-activity.container
rename to beeper/etc/containers/systemd/sharkey/sharkey-activity.container
diff --git a/beeper/etc/containers/systemd/sharkey-api.container b/beeper/etc/containers/systemd/sharkey/sharkey-api.container
similarity index 100%
rename from beeper/etc/containers/systemd/sharkey-api.container
rename to beeper/etc/containers/systemd/sharkey/sharkey-api.container
diff --git a/beeper/etc/containers/systemd/sharkey-dfdb.container b/beeper/etc/containers/systemd/sharkey/sharkey-dfdb.container
similarity index 100%
rename from beeper/etc/containers/systemd/sharkey-dfdb.container
rename to beeper/etc/containers/systemd/sharkey/sharkey-dfdb.container
diff --git a/beeper/etc/containers/systemd/sharkey-media.container b/beeper/etc/containers/systemd/sharkey/sharkey-media.container
similarity index 100%
rename from beeper/etc/containers/systemd/sharkey-media.container
rename to beeper/etc/containers/systemd/sharkey/sharkey-media.container
diff --git a/beeper/etc/containers/systemd/sharkey-worker.container b/beeper/etc/containers/systemd/sharkey/sharkey-worker.container
similarity index 100%
rename from beeper/etc/containers/systemd/sharkey-worker.container
rename to beeper/etc/containers/systemd/sharkey/sharkey-worker.container
diff --git a/beeper/etc/containers/networks/sharkey.network b/beeper/etc/containers/systemd/sharkey/sharkey.network
similarity index 100%
rename from beeper/etc/containers/networks/sharkey.network
rename to beeper/etc/containers/systemd/sharkey/sharkey.network