diff --git a/vitallink/docker-compose.yml b/vitallink/docker-compose.yml
index 603c230..be0a9ed 100644
--- a/vitallink/docker-compose.yml
+++ b/vitallink/docker-compose.yml
@@ -10,5 +10,6 @@ services:
     volumes:
       - ./simulator/wristband_config.yaml:/app/simulator/wristband_config.yaml
       - ./vitallink.db:/app/vitallink.db
+    environment:
+      - HOST_IP=192.168.65.227  # Pi's IP
     restart: unless-stopped
-    network_mode: host
diff --git a/vitallink/frontend/dashboard/src/App.jsx b/vitallink/frontend/dashboard/src/App.jsx
index 2d7ae9a..d3b602b 100644
--- a/vitallink/frontend/dashboard/src/App.jsx
+++ b/vitallink/frontend/dashboard/src/App.jsx
@@ -4,7 +4,7 @@ import PatientDetailModal from './PatientDetailModal';  // ADD THIS IMPORT
 
 const { Activity, AlertCircle, Clock, Users, Bell, Heart, Thermometer, Wind, CheckCircle, UserX } = LucideIcons;
 
-const API_BASE = 'http://localhost:8000';
+const API_BASE = 'http://${window.location.hostname}:8000';
 
 function App() {
   const [patients, setPatients] = useState([]);
diff --git a/vitallink/frontend/dashboard/src/PatientDetailModal.jsx b/vitallink/frontend/dashboard/src/PatientDetailModal.jsx
index 87b39d6..f3a64e8 100644
--- a/vitallink/frontend/dashboard/src/PatientDetailModal.jsx
+++ b/vitallink/frontend/dashboard/src/PatientDetailModal.jsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { LineChart, Line, XAxis, YAxis, CartesianGrid, Tooltip, Legend, ResponsiveContainer, ReferenceLine } from 'recharts';
 import { X, TrendingUp, TrendingDown, Activity, Heart, Wind, Thermometer } from 'lucide-react';
 
-const API_BASE = 'http://localhost:8000';
+const API_BASE = 'http://${window.location.hostname}:8000';
 
 const PatientDetailModal = ({ patient, onClose }) => {
   const [vitalsHistory, setVitalsHistory] = useState([]);
diff --git a/vitallink/frontend/kiosk/src/App.jsx b/vitallink/frontend/kiosk/src/App.jsx
index 3249420..5b0938b 100644
--- a/vitallink/frontend/kiosk/src/App.jsx
+++ b/vitallink/frontend/kiosk/src/App.jsx
@@ -3,7 +3,7 @@ import { AlertCircle, CheckCircle, Clock, User } from 'lucide-react';
 import Keyboard from "react-simple-keyboard";
 import "react-simple-keyboard/build/css/index.css";
 
-const API_BASE = 'http://localhost:8000';
+const API_BASE = 'http://${window.location.hostname}:8000';
 
 function App() {
   const [step, setStep] = useState('welcome');
diff --git a/vitallink/vitallink.db b/vitallink/vitallink.db
index 5cd895f..a4c7bc0 100644
Binary files a/vitallink/vitallink.db and b/vitallink/vitallink.db differ