diff --git a/authentik.env b/authentik.env
new file mode 100644
index 0000000..3a0da6c
--- /dev/null
+++ b/authentik.env
@@ -0,0 +1,16 @@
+AUTHENTIK_AUTHENTIK__GEOIP=/geoip/GeoLite2-City.mmdb
+AUTHENTIK_EMAIL__FROM=${EMAIL_FROM}
+AUTHENTIK_EMAIL__HOST=${EMAIL_HOST}
+AUTHENTIK_EMAIL__PASSWORD=${EMAIL_PASSWORD}
+AUTHENTIK_EMAIL__PORT=${EMAIL_PORT}
+AUTHENTIK_EMAIL__TIMEOUT=10
+AUTHENTIK_EMAIL__USE_SSL=false
+AUTHENTIK_EMAIL__USE_TLS=true
+AUTHENTIK_EMAIL__USERNAME=${EMAIL_FROM}
+AUTHENTIK_ERROR_REPORTING__ENABLED=true
+AUTHENTIK_PORT_HTTP=9200
+AUTHENTIK_PORT_HTTPS=7443
+AUTHENTIK_SECRET_KEY=tcVoaScDoqaIyAZDnAq3MYsHIBnzVYPbXzFVsOfWReoqatgsU7
+GEOIPUPDATE_ACCOUNT_ID=732732
+GEOIPUPDATE_LICENSE_KEY=3NGI4ijkeEfCsjyq
+PG_PASS=29PnrjM386yP3w
\ No newline at end of file
diff --git a/authentik.yml b/authentik.yml
index e59f4f2..d18079c 100644
--- a/authentik.yml
+++ b/authentik.yml
@@ -47,7 +47,8 @@ services:
       - ./custom-templates:${DOCKER_STORAGE_PATH}/authentik/templates
       - geoip:/geoip
     env_file:
-      - .env
+      - shared.env
+      - authentik.env
     ports:
       - "0.0.0.0:${AUTHENTIK_PORT_HTTP:-9000}:9000"
       - "0.0.0.0:${AUTHENTIK_PORT_HTTPS:-9443}:9443"
diff --git a/kavita.env b/kavita.env
new file mode 100644
index 0000000..efdcf9e
--- /dev/null
+++ b/kavita.env
@@ -0,0 +1,2 @@
+KAVITA_INTERNAL_PORT=5000
+KAVITA_EXTERNAL_PORT=5100
diff --git a/kavita.yml b/kavita.yml
index dc6ccd5..aafe39f 100644
--- a/kavita.yml
+++ b/kavita.yml
@@ -4,16 +4,14 @@ services:
   kavita:
     image: kizaing/kavita:latest
     restart: unless-stopped
-    environment:
-      PUID: 1000
-      PGID: 100
     volumes:
       - ${STORAGE_PATH}/media/comics:/manga
       - ${DOCKER_STORAGE_PATH}/kavita:/kavita/config
     env_file:
-      - .env
+      - shared.env
+      - kavita.env
     ports:
-      - "5100:5000"
+      - ${KAVITA_EXTERNAL_PORT}:${KAVITA_INTERNAL_PORT}
     networks:
       - internal
 
diff --git a/.env b/shared.env
similarity index 100%
rename from .env
rename to shared.env
diff --git a/valheim.env b/valheim.env
new file mode 100644
index 0000000..905c7f5
--- /dev/null
+++ b/valheim.env
@@ -0,0 +1,6 @@
+SERVER_NAME=LukasJirkaDominik
+WORLD_NAME=Mujnovyserver
+SERVER_PASS=heslo
+VALHEIM_PLUS=true
+VALHEIM_INTERNAL_PORT=2456-2457/udp
+VALHEIM_EXTERNAL_PORT=2456-2457
\ No newline at end of file
diff --git a/valheim.yml b/valheim.yml
index d3fcbcd..a04c7ba 100644
--- a/valheim.yml
+++ b/valheim.yml
@@ -6,17 +6,12 @@ services:
     image: ghcr.io/lloesche/valheim-server
     restart: unless-stopped
     volumes:
-      - /docker/valheim/config:/config
-      - /docker/valheim/data:/opt/valheim
-    environment:
-      - SERVER_NAME=LukasJirkaDominik
-      - WORLD_NAME=Mujnovyserver
-      - SERVER_PASS=heslo
-      - PUID=1000
-      - PGID=100
-      - TZ=Europe/Prague
-      - VALHEIM_PLUS=true
+      - ${DOCKER_STORAGE_PATH}/valheim/config:/config
+      - ${DOCKER_STORAGE_PATH}/valheim/data:/opt/valheim
+    env_file:
+      - shared.env
+      - valheim.env
     ports:
-      - "2456-2457:2456-2457/udp"
+      - ${VALHEIM_EXTERNAL_PORT}:${VALHEIM_INTERNAL_PORT}
     cap_add:
       - SYS_NICE
\ No newline at end of file