diff --git a/config-repo/application-local.yaml b/config-repo/application-local.yaml
index 5fc6b17..ccd2cc3 100644
--- a/config-repo/application-local.yaml
+++ b/config-repo/application-local.yaml
@@ -3,10 +3,8 @@
 pcp:
   infra:
     postgres:
-#      host: ${PCP_POSTGRES_HOST:localhost}
-#      port: ${PCP_POSTGRES_PORT:5432}
-      host: ${PCP_POSTGRES_HOST:192.168.100.160}
-      port: ${PCP_POSTGRES_PORT:35400}
+      host: ${PCP_POSTGRES_HOST:localhost}
+      port: ${PCP_POSTGRES_PORT:5432}
     kafka:
       host: ${PCP_KAFKA_HOST:localhost}
       port: ${PCP_KAFKA_PORT:29092}
diff --git a/config-repo/pcp-mission-planing-service.yaml b/config-repo/pcp-mission-planing-service.yaml
index b4e3866..935d86b 100644
--- a/config-repo/pcp-mission-planing-service.yaml
+++ b/config-repo/pcp-mission-planing-service.yaml
@@ -75,7 +75,7 @@ spring:
 camunda:
   client:
     mode: self-managed
-    grpc-address: ${CAMUNDA_GRPC_ADDRESS:http://192.168.60.201:26500}
+    grpc-address: ${CAMUNDA_GRPC_ADDRESS:http://localhost:26500}
     auth:
       method: none
     prefer-rest-over-grpc: false
diff --git a/config-repo/pcp-tgu-service.yaml b/config-repo/pcp-tgu-service.yaml
index c462796..6c3cc58 100644
--- a/config-repo/pcp-tgu-service.yaml
+++ b/config-repo/pcp-tgu-service.yaml
@@ -94,7 +94,7 @@ server:
 
 camunda:
   client:
-    grpc-address: ${CAMUNDA_GRPC_ADDRESS:http://192.168.60.201:26500}
+    grpc-address: ${CAMUNDA_GRPC_ADDRESS:http://localhost:26500}
 
 ---
 spring:
diff --git a/services/pcp-tgu-ops-ui/src/features/tgu-map-2d/Tgu2DMapView.tsx b/services/pcp-tgu-ops-ui/src/features/tgu-map-2d/Tgu2DMapView.tsx
index 37096a0..b9908e8 100644
--- a/services/pcp-tgu-ops-ui/src/features/tgu-map-2d/Tgu2DMapView.tsx
+++ b/services/pcp-tgu-ops-ui/src/features/tgu-map-2d/Tgu2DMapView.tsx
@@ -296,16 +296,25 @@ export function Tgu2DMapView({
     >
       <canvas className="tgu-2d-map__canvas" ref={canvasRef} />
       <svg className="tgu-2d-map__overlay" width={size.width} height={size.height} aria-hidden="true">
-        {overlayPolygons.map((polygon) => (
-          <polygon
-            key={polygon.id}
-            points={polygon.points.map((point) => {
-              const screen = projection.project(point);
-              return `${screen.x},${screen.y}`;
-            }).join(" ")}
-            className={polygon.id === selectedPolygon?.id ? "is-selected" : "is-hovered"}
-          />
-        ))}
+        {overlayPolygons.flatMap((polygon) => {
+          const raw = polygon.points.map((point) => projection.project(point));
+          const pts = unwrapX(raw, projection.worldSize);
+          const cls = polygon.id === selectedPolygon?.id ? "is-selected" : "is-hovered";
+          return ([0, projection.worldSize, -projection.worldSize] as const).flatMap((dx) => {
+            const visible = pts.some((p) => {
+              const x = p.x + dx;
+              return x >= -64 && x <= size.width + 64 && p.y >= -64 && p.y <= size.height + 64;
+            });
+            if (!visible) return [];
+            return (
+              <polygon
+                key={`${polygon.id}:${dx}`}
+                points={pts.map((p) => `${p.x + dx},${p.y}`).join(" ")}
+                className={cls}
+              />
+            );
+          });
+        })}
         {targets.map((t) => {
           const screen = projection.project(t);
           const isSelected = t.id === selectedTargetId;
@@ -365,6 +374,20 @@ function layerTitle(layer: MapPolygon["layer"]): string {
   }
 }
 
+function unwrapX(points: { x: number; y: number }[], worldSize: number): { x: number; y: number }[] {
+  if (points.length === 0) return [];
+  const out: { x: number; y: number }[] = [points[0]];
+  let prevX = points[0].x;
+  for (let i = 1; i < points.length; i++) {
+    let x = points[i].x;
+    while (x - prevX > worldSize / 2) x -= worldSize;
+    while (prevX - x > worldSize / 2) x += worldSize;
+    out.push({ x, y: points[i].y });
+    prevX = x;
+  }
+  return out;
+}
+
 function uniquePolygons(polygons: Array<MapPolygon | undefined>): MapPolygon[] {
   const result: MapPolygon[] = [];
   const ids = new Set<string>();
diff --git a/services/pcp-tgu-ops-ui/src/features/tgu-map-2d/geometry/spatialIndex.ts b/services/pcp-tgu-ops-ui/src/features/tgu-map-2d/geometry/spatialIndex.ts
index e971931..44ca8eb 100644
--- a/services/pcp-tgu-ops-ui/src/features/tgu-map-2d/geometry/spatialIndex.ts
+++ b/services/pcp-tgu-ops-ui/src/features/tgu-map-2d/geometry/spatialIndex.ts
@@ -24,10 +24,21 @@ export function hitTestPolygons(index: PolygonSpatialIndex, point: GeoPoint): Ma
   let selected: MapPolygon | undefined;
 
   for (const entry of index.entries) {
-    if (!bboxContainsPoint(entry.bbox, point)) continue;
-    if (!pointInPolygon(point, entry.polygon.points)) continue;
+    // Check bbox allowing ±360° shifts so antimeridian-crossing polygons are not skipped.
+    const inBbox =
+      bboxContainsPoint(entry.bbox, point) ||
+      bboxContainsPoint(entry.bbox, { lon: point.lon + 360, lat: point.lat }) ||
+      bboxContainsPoint(entry.bbox, { lon: point.lon - 360, lat: point.lat });
+    if (!inBbox) continue;
 
-    if (!selected || entry.polygon.zIndex >= selected.zIndex) {
+    // Normalize polygon lons to be continuous (same idea as unwrapX for screen coords).
+    const normalized = unwrapLon(entry.polygon.points);
+    const hit =
+      pointInPolygon(point, normalized) ||
+      pointInPolygon({ lon: point.lon + 360, lat: point.lat }, normalized) ||
+      pointInPolygon({ lon: point.lon - 360, lat: point.lat }, normalized);
+
+    if (hit && (!selected || entry.polygon.zIndex >= selected.zIndex)) {
       selected = entry.polygon;
     }
   }
@@ -42,3 +53,17 @@ export function queryPolygonsByBBox(index: PolygonSpatialIndex, bbox: BBox): Map
     .map((entry) => entry.polygon);
 }
 
+function unwrapLon(points: GeoPoint[]): GeoPoint[] {
+  if (points.length === 0) return points;
+  const out: GeoPoint[] = [points[0]];
+  let prevLon = points[0].lon;
+  for (let i = 1; i < points.length; i++) {
+    let lon = points[i].lon;
+    while (lon - prevLon > 180) lon -= 360;
+    while (prevLon - lon > 180) lon += 360;
+    out.push({ ...points[i], lon });
+    prevLon = lon;
+  }
+  return out;
+}
+
diff --git a/services/pcp-tgu-ops-ui/vite.config.ts b/services/pcp-tgu-ops-ui/vite.config.ts
index 917129f..044cdfe 100644
--- a/services/pcp-tgu-ops-ui/vite.config.ts
+++ b/services/pcp-tgu-ops-ui/vite.config.ts
@@ -4,6 +4,7 @@ import react from "@vitejs/plugin-react";
 export default defineConfig({
   plugins: [react()],
   server: {
+    host: "0.0.0.0",
     port: 5174,
     proxy: {
       "/api/pcp-request": {