diff --git a/docker/authentik/authentik.toml b/docker/authentik/authentik.toml
deleted file mode 100644
index 4bba2c6..0000000
--- a/docker/authentik/authentik.toml
+++ /dev/null
@@ -1,64 +0,0 @@
-[services.redis]
-image = "docker.io/library/redis:alpine"
-command = "--save 60 1 --loglevel warning"
-restart = "unless-stopped"
-volumes = ["redis:/data"]
-
-[services.redis.healthcheck]
-test = ["CMD-SHELL", "redis-cli ping | grep PONG"]
-start_period = "20s"
-interval = "30s"
-retries = 5
-timeout = "3s"
-
-[services.server]
-image = "${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.10.1}"
-restart = "unless-stopped"
-command = "server"
-volumes = [
-  "/docker/authentik/media:/media",
-  "/docker/authentik/custom-templates:/templates",
-  "/docker/authentik/geoip:/geoip",
-]
-env_file = [".env"]
-ports = [
-  "0.0.0.0:${AUTHENTIK_PORT_HTTP:-9000}:9000",
-  "0.0.0.0:${AUTHENTIK_PORT_HTTPS:-9443}:9443",
-]
-
-[services.server.environment]
-AUTHENTIK_REDIS__HOST = "redis"
-AUTHENTIK_POSTGRESQL__HOST = "postgresql"
-AUTHENTIK_POSTGRESQL__USER = "${PG_USER:-authentik}"
-AUTHENTIK_POSTGRESQL__NAME = "${PG_DB:-authentik}"
-AUTHENTIK_POSTGRESQL__PASSWORD = "${PG_PASS}"
-
-[services.worker]
-image = "${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.10.1}"
-restart = "unless-stopped"
-command = "worker"
-user = "root"
-volumes = [
-  "./media:/media",
-  "./certs:/certs",
-  "/var/run/docker.sock:/var/run/docker.sock",
-  "./custom-templates:/templates",
-  "geoip:/geoip",
-]
-env_file = [".env"]
-
-[services.worker.environment]
-AUTHENTIK_REDIS__HOST = "redis"
-AUTHENTIK_POSTGRESQL__HOST = "postgresql"
-AUTHENTIK_POSTGRESQL__USER = "${PG_USER:-authentik}"
-AUTHENTIK_POSTGRESQL__NAME = "${PG_DB:-authentik}"
-AUTHENTIK_POSTGRESQL__PASSWORD = "${PG_PASS}"
-
-[services.geoipupdate]
-image = "maxmindinc/geoipupdate:latest"
-volumes = ["geoip:/usr/share/GeoIP"]
-env_file = [".env"]
-
-[services.geoipupdate.environment]
-GEOIPUPDATE_EDITION_IDS = "GeoLite2-City"
-GEOIPUPDATE_FREQUENCY = "8"
diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml
index e8999e7..11642ad 100644
--- a/docker/authentik/docker-compose.toml
+++ b/docker/authentik/docker-compose.toml
@@ -13,7 +13,7 @@ retries = 5
 timeout = "3s"
 
 [services.server]
-image = "ghcr.io/goauthentik/server:latest"
+image = "ghcr.io/goauthentik/server"
 container_name = "authentik"
 restart = "unless-stopped"
 command = "server"
@@ -39,7 +39,7 @@ labels = [
 ]
 
 [services.worker]
-image = "ghcr.io/goauthentik/server:latest"
+image = "ghcr.io/goauthentik/server"
 container_name = "authentik-worker"
 restart = "unless-stopped"
 command = "worker"
@@ -55,7 +55,7 @@ env_file = [".env"]
 networks = ["authentik", "postgres"]
 
 [services.geoipupdate]
-image = "maxmindinc/geoipupdate:latest"
+image = "maxmindinc/geoipupdate"
 container_name = "authentik-geoipupdate"
 restart = "unless-stopped"
 networks = ["authentik"]
diff --git a/docker/pihole/docker-compose.toml b/docker/pihole/docker-compose.toml
index 5eaff1c..a578112 100644
--- a/docker/pihole/docker-compose.toml
+++ b/docker/pihole/docker-compose.toml
@@ -2,7 +2,7 @@
 
 [services.pihole]
 container_name = "pihole"
-image = "pihole/pihole:latest"
+image = "pihole/pihole"
 ports = ["53:53/tcp", "53:53/udp", "67:67/udp", "8069:80/tcp"]
 networks = ["proxy"]
 volumes = [
diff --git a/docker/searx/docker-compose.toml b/docker/searx/docker-compose.toml
index 8e12694..d181ab1 100644
--- a/docker/searx/docker-compose.toml
+++ b/docker/searx/docker-compose.toml
@@ -1,6 +1,6 @@
 [services.searx]
 container_name = "searx"
-image = "searxng/searxng:latest"
+image = "searxng/searxng"
 restart = "unless-stopped"
 networks = ["searx", "proxy"]
 volumes = [
diff --git a/docker/traefik/docker-compose.toml b/docker/traefik/docker-compose.toml
index 98b996b..3d0d7ae 100644
--- a/docker/traefik/docker-compose.toml
+++ b/docker/traefik/docker-compose.toml
@@ -1,5 +1,5 @@
 [services.traefik]
-image = "traefik:latest"
+image = "traefik"
 container_name = "traefik"
 restart = "unless-stopped"
 ports = ["80:80", "443:443/tcp", "443:443/udp"]
@@ -34,7 +34,7 @@ labels = [
 ]
 
 [services.fail2ban]
-image = "crazymax/fail2ban:latest"
+image = "crazymax/fail2ban"
 container_name = "fail2ban"
 restart = "unless-stopped"
 network_mode = "host"