diff --git a/services/services.yaml b/services/services.yaml
index 9b23207..c130852 100644
--- a/services/services.yaml
+++ b/services/services.yaml
@@ -74,13 +74,6 @@ services:
       <<: *vm-media-100-55
     <<: *defaultServiceValues
 
-  - name: "kavita"
-    ports:
-      - 12790
-    host:
-      <<: *vm-media-100-55
-    <<: *defaultServiceValues
-
   # ================================
   # vm-tools-100-65
   # ================================
@@ -149,7 +142,7 @@ services:
   - name: "wireguard"
     ports:
       - 51820
-      - 5182
+      - 51821
     host:
       <<: *vm-network-100-75
     <<: *defaultServiceValues
diff --git a/services/wireguard/.env b/services/wireguard/.env
index cce5b59..abaf4fd 100644
--- a/services/wireguard/.env
+++ b/services/wireguard/.env
@@ -1 +1,5 @@
-CONFIG_PATH="/home/vm-user/remote-apps/wireguard/etc"
\ No newline at end of file
+CONFIG_PATH="/home/vm-user/remote-apps/wireguard/etc"
+WG_ALLOWED_IPS=0.0.0.0/0
+WG_DEFAULT_ADDRESS=192.168.99.x
+WG_DEFAULT_DNS=192.168.100.96
+WG_DEVICE=eth0
\ No newline at end of file
diff --git a/services/wireguard/docker-compose.yml b/services/wireguard/docker-compose.yml
index 5f85586..edf5c7d 100644
--- a/services/wireguard/docker-compose.yml
+++ b/services/wireguard/docker-compose.yml
@@ -5,6 +5,12 @@ services:
     environment:
       - PASSWORD_HASH=$$2a$$12$$OJUgCywoc/JuPvTO4hOzi.6toYnROQWdqYxnYCf5FSw2WSeygQF9K
       - WG_HOST=wireguard.davydovcloud.com
+      - WG_DEVICE=${WG_DEVICE}
+      - WG_ALLOWED_IPS=${WG_ALLOWED_IPS}
+      - WG_DEFAULT_DNS=${WG_DEFAULT_DNS}
+      - WG_DEFAULT_ADDRESS=${WG_DEFAULT_ADDRESS}
+      - WG_PERSISTENT_KEEPALIVE=25
+      - UI_TRAFFIC_STATS=true
       - PEERDNS=auto
     volumes:
       - ${CONFIG_PATH}:/etc/wireguard