diff --git a/.gitignore b/.gitignore
index 934c1fb..b3a19ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 */.env
+*/podman-compose.yaml
diff --git a/authentik/docker-compose.toml b/authentik/podman-compose.toml
similarity index 100%
rename from authentik/docker-compose.toml
rename to authentik/podman-compose.toml
diff --git a/caddy/docker-compose.toml b/caddy/podman-compose.toml
similarity index 96%
rename from caddy/docker-compose.toml
rename to caddy/podman-compose.toml
index bfbb935..73019e8 100644
--- a/caddy/docker-compose.toml
+++ b/caddy/podman-compose.toml
@@ -2,9 +2,9 @@
 image = "slothcroissant/caddy-cloudflaredns"
 container_name = "caddy"
 restart = "unless-stopped"
-user = "82:82"
 ports = ["80:80", "443:443/tcp", "443:443/udp"]
 networks = ["proxy"]
+env_file = [".env"]
 volumes = [
   "~/data/caddy/data:/data",
   "~/data/caddy/config:/config",
diff --git a/ddns/docker-compose.toml b/ddns/podman-compose.toml
similarity index 100%
rename from ddns/docker-compose.toml
rename to ddns/podman-compose.toml
diff --git a/forgejo/docker-compose.toml b/forgejo/podman-compose.toml
similarity index 100%
rename from forgejo/docker-compose.toml
rename to forgejo/podman-compose.toml
diff --git a/freshrss/docker-compose.toml b/freshrss/podman-compose.toml
similarity index 100%
rename from freshrss/docker-compose.toml
rename to freshrss/podman-compose.toml
diff --git a/homeautomation/docker-compose.toml b/homeautomation/podman-compose.toml
similarity index 100%
rename from homeautomation/docker-compose.toml
rename to homeautomation/podman-compose.toml
diff --git a/jellyfin/docker-compose.toml b/jellyfin/podman-compose.toml
similarity index 100%
rename from jellyfin/docker-compose.toml
rename to jellyfin/podman-compose.toml
diff --git a/misskey/docker-compose.toml b/misskey/podman-compose.toml
similarity index 100%
rename from misskey/docker-compose.toml
rename to misskey/podman-compose.toml
diff --git a/nextcloud/docker-compose.toml b/nextcloud/podman-compose.toml
similarity index 100%
rename from nextcloud/docker-compose.toml
rename to nextcloud/podman-compose.toml
diff --git a/ofelia/docker-compose.toml b/ofelia/podman-compose.toml
similarity index 100%
rename from ofelia/docker-compose.toml
rename to ofelia/podman-compose.toml
diff --git a/pihole/docker-compose.toml b/pihole/podman-compose.toml
similarity index 100%
rename from pihole/docker-compose.toml
rename to pihole/podman-compose.toml
diff --git a/podman-compose-toml.zsh b/podman-compose-toml.zsh
new file mode 100644
index 0000000..8387063
--- /dev/null
+++ b/podman-compose-toml.zsh
@@ -0,0 +1,16 @@
+# source this file in ZSH to get TOML support in podman-compose
+# via the dct command
+# yj is required for this to work.
+# function name stands for Podman Compose Toml
+pct () {
+	local file_path=('./podman-compose.toml') 
+	zmodload zsh/zutil
+	zparseopts -D -K -- f:=file_path || return 1
+	file_path=${file_path[-1]} 
+	if [[ ! -a "$file_path" ]]
+	then
+		echo "File $file_path does not exist!"
+		return 1
+	fi
+	yj -ty < $file_path | docker-compose -f - $@
+}
diff --git a/postgres/docker-compose.toml b/postgres/podman-compose.toml
similarity index 100%
rename from postgres/docker-compose.toml
rename to postgres/podman-compose.toml
diff --git a/searx/docker-compose.toml b/searx/podman-compose.toml
similarity index 100%
rename from searx/docker-compose.toml
rename to searx/podman-compose.toml
diff --git a/stats/docker-compose.toml b/stats/podman-compose.toml
similarity index 98%
rename from stats/docker-compose.toml
rename to stats/podman-compose.toml
index e8200dc..cb2db86 100644
--- a/stats/docker-compose.toml
+++ b/stats/podman-compose.toml
@@ -3,7 +3,6 @@ image = "grafana/grafana"
 container_name = "grafana"
 volumes = ["~/data/stats/grafana:/var/lib/grafana"]
 networks = ["stats", "proxy"]
-user = "1000:984"
 env_file = [".env"]
 environment = [
   "GF_AUTH_GENERIC_OAUTH_CLIENT_ID",
diff --git a/tvheadend/docker-compose.toml b/tvheadend/podman-compose.toml
similarity index 100%
rename from tvheadend/docker-compose.toml
rename to tvheadend/podman-compose.toml
diff --git a/umami/docker-compose.toml b/umami/podman-compose.toml
similarity index 100%
rename from umami/docker-compose.toml
rename to umami/podman-compose.toml
diff --git a/woodpecker/docker-compose.toml b/woodpecker/podman-compose.toml
similarity index 100%
rename from woodpecker/docker-compose.toml
rename to woodpecker/podman-compose.toml