diff --git a/cluster/apps/kube-system/cilium/config-map.yaml b/cluster/apps/kube-system/cilium/config-map.yaml
index de4cd7ba..d00583bc 100644
--- a/cluster/apps/kube-system/cilium/config-map.yaml
+++ b/cluster/apps/kube-system/cilium/config-map.yaml
@@ -7,12 +7,12 @@ metadata:
 data:
   config.yaml: |
     peers:
-      - peer-address: 10.75.40.1
+      - peer-address: ${GATEWAY_IP}
         peer-asn: 64512
         my-asn: 64512
     address-pools:
       - name: default
         protocol: bgp
         addresses:
-          - 10.75.45.0/24
+          - ${NETWORK_BGP_SVC_RANGE}
         avoid-buggy-ips: true
diff --git a/cluster/apps/monitoring/vector/aggregator/helm-release.yaml b/cluster/apps/monitoring/vector/aggregator/helm-release.yaml
index 81766186..7558f013 100644
--- a/cluster/apps/monitoring/vector/aggregator/helm-release.yaml
+++ b/cluster/apps/monitoring/vector/aggregator/helm-release.yaml
@@ -141,7 +141,7 @@ spec:
             patch:
               - op: add
                 path: /spec/loadBalancerIP
-                value: "${SVC_SYSLOG_ADDR}"
+                value: "${SVC_VECTOR_AGGREGATOR_ADDR}"
               - op: replace
                 path: /spec/externalTrafficPolicy
                 value: Local
diff --git a/cluster/config/cluster-settings.yaml b/cluster/config/cluster-settings.yaml
index a1611acc..4beb966a 100644
--- a/cluster/config/cluster-settings.yaml
+++ b/cluster/config/cluster-settings.yaml
@@ -13,13 +13,9 @@ data:
   NETWORK_K8S_CLUSTER_CIDR: 172.22.0.0/16
   NETWORK_K8S_SERVICE_CIDR: 172.24.0.0/16
   NETWORK_MANAGEMENT_CIDR: 10.0.0.0/8
-  METALLB_LB_RANGE: 10.75.42.100-10.75.42.120
-  LB_COREDNS_IP: 10.75.45.100
-  LB_TRAEFIK_IP: 10.75.45.101
-  SVC_NGINX_ADDR: 10.75.45.101
-  SVC_SYSLOG_ADDR: 10.75.45.102
-  SVC_PLEX_ADDR: 10.75.45.103
-  SVC_JELLYFIN_ADDR: 10.75.45.104
-  LB_BLOCKY_IP: 10.75.45.105
-  SVC_QBITTORRENT_ADDR: 10.75.45.106
-  SVC_OWNCAST_ADDR: 10.75.45.107
+  NETWORK_BGP_SVC_RANGE: 10.5.0.0/24
+  SVC_NGINX_ADDR: 10.5.0.1
+  SVC_VECTOR_AGGREGATOR_ADDR: 10.5.0.2
+  SVC_PLEX_ADDR: 10.5.0.3
+  SVC_JELLYFIN_ADDR: 10.5.0.4
+  SVC_OWNCAST_ADDR: 10.5.0.5