diff --git a/apps/dispatch-server/index.ts b/apps/dispatch-server/index.ts
index c54f6119..21597f3f 100644
--- a/apps/dispatch-server/index.ts
+++ b/apps/dispatch-server/index.ts
@@ -5,6 +5,7 @@ import { Server } from "socket.io";
 import { createAdapter } from "@socket.io/redis-adapter";
 import { jwtMiddleware } from "modules/socketJWTmiddleware";
 import { pubClient, subClient } from "modules/redis";
+import { handle } from "socket-events/connect-dispatch";
 
 const app = express();
 const server = createServer(app);
@@ -17,7 +18,7 @@ const io = new Server(server, {
 io.use(jwtMiddleware);
 
 io.on("connection", (socket) => {
-	socket.on("connect-dispatch", () => {});
+	socket.on("connect-dispatch", handle(socket, io));
 });
 server.listen(process.env.PORT, () => {
 	console.log(`Server running on port ${process.env.PORT}`);
diff --git a/apps/dispatch-server/package.json b/apps/dispatch-server/package.json
index 74e07cf1..2eaacc9e 100644
--- a/apps/dispatch-server/package.json
+++ b/apps/dispatch-server/package.json
@@ -13,12 +13,12 @@
 		"@types/express": "^5.0.0",
 		"@types/node": "^22.13.5",
 		"@types/nodemailer": "^6.4.17",
-		"@types/socket.io-redis": "^3.0.0",
 		"concurrently": "^9.1.2",
 		"typescript": "latest"
 	},
 	"dependencies": {
 		"@react-email/components": "^0.0.33",
+		"@redis/json": "^1.0.7",
 		"@socket.io/redis-adapter": "^8.3.0",
 		"axios": "^1.7.9",
 		"cron": "^4.1.0",
@@ -28,7 +28,6 @@
 		"nodemailer": "^6.10.0",
 		"react": "^19.0.0",
 		"redis": "^4.7.0",
-		"socket.io": "^4.8.1",
-		"socket.io-redis": "^6.1.1"
+		"socket.io": "^4.8.1"
 	}
 }
diff --git a/apps/dispatch-server/socket-events/connect-dispatch.ts b/apps/dispatch-server/socket-events/connect-dispatch.ts
index 47048cb3..8d1876c7 100644
--- a/apps/dispatch-server/socket-events/connect-dispatch.ts
+++ b/apps/dispatch-server/socket-events/connect-dispatch.ts
@@ -1,14 +1,34 @@
 import { pubClient } from "modules/redis";
 import { Server, Socket } from "socket.io";
 
-export const handle = (socket: Socket, io: Server) => async (jwt: string) => {
-	const userId = socket.data.user.id; // User ID aus dem JWT-Token
-	await pubClient.set(`dispatchers:${socket.id}`, userId);
+export const handle =
+	(socket: Socket, io: Server) =>
+	async ({
+		logoffTime,
+		selectedZone,
+	}: {
+		logoffTime: string;
+		selectedZone: string;
+	}) => {
+		const userId = socket.data.user.id; // User ID aus dem JWT-Token
+		await pubClient.json.set(`dispatchers:${socket.id}`, "$", {
+			logoffTime,
+			selectedZone,
+			userId,
+		});
 
-	socket.join("dispatchers"); // Dem Dispatcher-Raum beitreten
+		socket.join("dispatchers"); // Dem Dispatcher-Raum beitreten
 
-	socket.on("disconnect", async () => {
-		console.log("Disconnected from dispatch server");
-		await pubClient.del(`dispatchers:${socket.id}`);
-	});
-};
+		const keys = await pubClient.keys("dispatchers:*");
+		const dispatchers = await Promise.all(
+			keys.map(async (key) => {
+				return await pubClient.json.get(key);
+			}),
+		);
+		console.log(dispatchers);
+
+		socket.on("disconnect", async () => {
+			console.log("Disconnected from dispatch server");
+			await pubClient.json.del(`dispatchers:${socket.id}`);
+		});
+	};
diff --git a/apps/dispatch/app/(dispatch)/_components/Connection.tsx b/apps/dispatch/app/(dispatch)/_components/Connection.tsx
index 58dc3856..6862e894 100644
--- a/apps/dispatch/app/(dispatch)/_components/Connection.tsx
+++ b/apps/dispatch/app/(dispatch)/_components/Connection.tsx
@@ -1,79 +1,96 @@
 "use client";
 import { useSession } from "next-auth/react";
 import { connectionStore } from "../../_store/connectionStore";
-import { useEffect } from "react";
-import { CheckCircledIcon } from "@radix-ui/react-icons";
+import { useEffect, useRef, useState } from "react";
+import { useForm } from "react-hook-form";
 
-export const ConnectBtn = () => {
+export const ConnectionBtn = () => {
+	const modalRef = useRef<HTMLDialogElement>(null);
+	const connection = connectionStore((state) => state);
+	const [form, setForm] = useState({
+		logoffTime: "",
+		selectedZone: "LST_01",
+	});
+	const session = useSession();
+	const uid = session.data?.user?.id;
+	if (!uid) return null;
 	return (
 		<>
-			<button
-				className="btn btn-soft btn-info"
-				onClick={() =>
-					(
-						document.getElementById("my_modal_1") as HTMLDialogElement
-					)?.showModal()
-				}
-			>
-				Verbinden
-			</button>
-			<dialog id="my_modal_1" className="modal">
+			{!connection.isConnected ? (
+				<button
+					className="btn btn-soft btn-info"
+					onClick={() => modalRef.current?.showModal()}
+				>
+					Verbinden
+				</button>
+			) : (
+				<button
+					className="btn btn-soft btn-success"
+					onClick={() => modalRef.current?.showModal()}
+				>
+					Verbunden
+				</button>
+			)}
+
+			<dialog ref={modalRef} className="modal">
 				<div className="modal-box flex flex-col items-center justify-center">
-					<h3 className="text-lg font-bold mb-5">Als Disponent anmelden</h3>
+					{connection.isConnected ? (
+						<h3 className="text-lg font-bold mb-5">
+							Verbunden als{" "}
+							<span className="text-info">
+								&lt;{connection.selectedZone}&gt;
+							</span>
+						</h3>
+					) : (
+						<h3 className="text-lg font-bold mb-5">Als Disponent anmelden</h3>
+					)}
 					<fieldset className="fieldset w-full">
 						<label className="floating-label w-full text-base">
 							<span>Logoff Zeit (UTC+1)</span>
-							<input type="time" className="input w-full" />
+							<input
+								onChange={(e) =>
+									setForm({
+										...form,
+										logoffTime: e.target.value,
+									})
+								}
+								value={form.logoffTime}
+								type="time"
+								className="input w-full"
+							/>
 						</label>
-						<p className="fieldset-label">
-							Du kannst diese Zeit später noch anpassen.
-						</p>
+						{!connection.isConnected && (
+							<p className="fieldset-label">
+								Du kannst diese Zeit später noch anpassen.
+							</p>
+						)}
 					</fieldset>
 					<div className="modal-action flex justify-between w-full">
 						<form method="dialog" className="w-full flex justify-between">
 							<button className="btn btn-soft">Abbrechen</button>
-							<button className="btn btn-soft btn-info">Verbinden</button>
-						</form>
-					</div>
-				</div>
-			</dialog>
-		</>
-	);
-};
-
-export const ConnectedBtn = () => {
-	return (
-		<>
-			<button
-				className="btn btn-soft btn-success"
-				onClick={() =>
-					(
-						document.getElementById("my_modal_1") as HTMLDialogElement
-					)?.showModal()
-				}
-			>
-				Verbunden
-			</button>
-			<dialog id="my_modal_1" className="modal">
-				<div className="modal-box flex flex-col items-center justify-center">
-					<h3 className="text-lg font-bold mb-5">
-						Verbunden als <span className="text-info">&lt;LST_01&gt;</span>
-					</h3>
-					<fieldset className="fieldset w-full">
-						<label className="floating-label w-full text-base join">
-							<span>Logoff Zeit (UTC+1)</span>
-							<input type="time" className="input w-full" />
-							<button className="btn btn-soft btn-info join-item">
-								<CheckCircledIcon className="w-4 h-4" /> Save
-							</button>
-						</label>
-					</fieldset>
-					<div className="modal-action flex justify-between w-full">
-						<form method="dialog" className="w-full flex justify-between">
-							<button className="btn btn-soft">Abbrechen</button>
-							<button className="btn btn-soft btn-error">
-								Verbindung Trennen
-							</button>
+							{connection.isConnected ? (
+								<button
+									className="btn btn-soft btn-error"
+									type="submit"
+									onSubmit={() => false}
+									onClick={() => {
+										connection.disconnect();
+									}}
+								>
+									Verbindung Trennen
+								</button>
+							) : (
+								<button
+									type="submit"
+									onSubmit={() => false}
+									onClick={() => {
+										connection.connect(uid, form.selectedZone, form.logoffTime);
+									}}
+									className="btn btn-soft btn-info"
+								>
+									Verbinden
+								</button>
+							)}
 						</form>
 					</div>
 				</div>
@@ -83,15 +100,9 @@ export const ConnectedBtn = () => {
 };
 
 export const Connection = () => {
-	const session = useSession();
-	const cStore = connectionStore((state) => state);
-	const uid = session.data?.user?.id;
-
-	useEffect(() => {
-		if (uid) {
-			cStore.connect(uid);
-		}
-	}, [uid]);
-
-	return <div>{cStore.isConnected ? <ConnectedBtn /> : <ConnectBtn />}</div>;
+	return (
+		<div>
+			<ConnectionBtn />
+		</div>
+	);
 };
diff --git a/apps/dispatch/app/_store/connectionStore.ts b/apps/dispatch/app/_store/connectionStore.ts
index 1ba1764a..22719f1b 100644
--- a/apps/dispatch/app/_store/connectionStore.ts
+++ b/apps/dispatch/app/_store/connectionStore.ts
@@ -3,17 +3,39 @@ import { socket } from "../(dispatch)/socket";
 
 interface ConnectionStore {
 	isConnected: boolean;
-	connect: (uid: string) => Promise<void>;
+	selectedZone: string;
+	connect: (
+		uid: string,
+		selectedZone: string,
+		logoffTime: string,
+	) => Promise<void>;
+	disconnect: () => void;
 }
 
 export const connectionStore = create<ConnectionStore>((set) => ({
 	isConnected: false,
-	connect: async (uid: string) => {
-		socket.auth = { uid };
-		socket.connect();
+	selectedZone: "LST_01",
+	connect: async (uid, selectedZone, logoffTime) =>
+		new Promise((resolve) => {
+			socket.auth = { uid };
+			set({ selectedZone });
+			socket.connect();
+			socket.once("connect", () => {
+				socket.emit("connect-dispatch", {
+					logoffTime,
+					selectedZone,
+				});
+				resolve();
+			});
+		}),
+	disconnect: () => {
+		socket.disconnect();
 	},
 }));
 
 socket.on("connect", () => {
 	connectionStore.setState({ isConnected: true });
 });
+socket.on("disconnect", () => {
+	connectionStore.setState({ isConnected: false });
+});
diff --git a/apps/dispatch/package.json b/apps/dispatch/package.json
index 90643a3b..cdcc38e5 100644
--- a/apps/dispatch/package.json
+++ b/apps/dispatch/package.json
@@ -20,6 +20,7 @@
 		"postcss": "^8.5.1",
 		"react": "^19.0.0",
 		"react-dom": "^19.0.0",
+		"react-hook-form": "^7.54.2",
 		"socket.io-client": "^4.8.1",
 		"tailwindcss": "^4.0.14",
 		"zustand": "^5.0.3"
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 81cd18b2..ea7338d3 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -23,15 +23,11 @@ services:
       - postgres
   redis:
     container_name: redis
-    image: docker.io/bitnami/redis:7.4
-    environment:
-      # ALLOW_EMPTY_PASSWORD is recommended only for development.
-      - ALLOW_EMPTY_PASSWORD=yes
-      - REDIS_DISABLE_COMMANDS=FLUSHDB,FLUSHALL
+    image: redis/redis-stack:latest
     ports:
       - "6379:6379"
     volumes:
-      - "redis_data:/bitnami/redis/data"
+      - "redis_data:/data"
 
   moodle_database:
     container_name: moodle_database
diff --git a/package-lock.json b/package-lock.json
index 339dded6..ac4479a9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -30,6 +30,7 @@
 				"postcss": "^8.5.1",
 				"react": "^19.0.0",
 				"react-dom": "^19.0.0",
+				"react-hook-form": "^7.54.2",
 				"socket.io-client": "^4.8.1",
 				"tailwindcss": "^4.0.14",
 				"zustand": "^5.0.3"
@@ -48,6 +49,7 @@
 		"apps/dispatch-server": {
 			"dependencies": {
 				"@react-email/components": "^0.0.33",
+				"@redis/json": "^1.0.7",
 				"@socket.io/redis-adapter": "^8.3.0",
 				"axios": "^1.7.9",
 				"cron": "^4.1.0",