diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 1abfc01b..af054026 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -15,6 +15,7 @@
         "@sveltejs/adapter-node": "^5.0.1",
         "@sveltejs/adapter-static": "^3.0.1",
         "@webcontainer/api": "^1.1.9",
+        "@xterm/xterm": "^5.5.0",
         "@xyflow/svelte": "^0.1.3",
         "chart.js": "^4.4.3",
         "diff": "^5.2.0",
@@ -27,7 +28,9 @@
         "svelte-french-toast": "^1.2.0",
         "svelte-local-storage-store": "^0.6.4",
         "svelte-monaco": "^0.3.0",
-        "svelte-purify": "^1.1.27"
+        "svelte-purify": "^1.1.27",
+        "xterm": "^5.3.0",
+        "xterm-addon-fit": "^0.8.0"
       },
       "devDependencies": {
         "@sveltejs/adapter-auto": "^3.2.2",
@@ -1921,6 +1924,11 @@
       "resolved": "https://registry.npmjs.org/@webcontainer/api/-/api-1.1.9.tgz",
       "integrity": "sha512-Sp6PV0K9D/3f8fSbCubqhfmBFH8XbngZCBOCF+aExyGqnz2etmw+KYvbQ/JxYvYX5KPaSxM+asFQwoP2RHl5cg=="
     },
+    "node_modules/@xterm/xterm": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.5.0.tgz",
+      "integrity": "sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A=="
+    },
     "node_modules/@xyflow/svelte": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/@xyflow/svelte/-/svelte-0.1.3.tgz",
@@ -6500,6 +6508,21 @@
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
     },
+    "node_modules/xterm": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/xterm/-/xterm-5.3.0.tgz",
+      "integrity": "sha512-8QqjlekLUFTrU6x7xck1MsPzPA571K5zNqWm0M0oroYEWVOptZ0+ubQSkQ3uxIEhcIHRujJy6emDWX4A7qyFzg==",
+      "deprecated": "This package is now deprecated. Move to @xterm/xterm instead."
+    },
+    "node_modules/xterm-addon-fit": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/xterm-addon-fit/-/xterm-addon-fit-0.8.0.tgz",
+      "integrity": "sha512-yj3Np7XlvxxhYF/EJ7p3KHaMt6OdwQ+HDu573Vx1lRXsVxOcnVJs51RgjZOouIZOczTsskaS+CpXspK81/DLqw==",
+      "deprecated": "This package is now deprecated. Move to @xterm/addon-fit instead.",
+      "peerDependencies": {
+        "xterm": "^5.0.0"
+      }
+    },
     "node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index e2747a9d..12d8a857 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -55,6 +55,7 @@
     "@sveltejs/adapter-node": "^5.0.1",
     "@sveltejs/adapter-static": "^3.0.1",
     "@webcontainer/api": "^1.1.9",
+    "@xterm/xterm": "^5.5.0",
     "@xyflow/svelte": "^0.1.3",
     "chart.js": "^4.4.3",
     "diff": "^5.2.0",
@@ -67,6 +68,8 @@
     "svelte-french-toast": "^1.2.0",
     "svelte-local-storage-store": "^0.6.4",
     "svelte-monaco": "^0.3.0",
-    "svelte-purify": "^1.1.27"
+    "svelte-purify": "^1.1.27",
+    "xterm": "^5.3.0",
+    "xterm-addon-fit": "^0.8.0"
   }
 }
diff --git a/frontend/src/lib/components/map/Console.svelte b/frontend/src/lib/components/map/Console.svelte
new file mode 100644
index 00000000..1ed19242
--- /dev/null
+++ b/frontend/src/lib/components/map/Console.svelte
@@ -0,0 +1,157 @@
+<script lang="ts">
+  import { onDestroy, onMount } from "svelte";
+  import darkTheme from "$lib/stores/theme";
+  import { terminal_size } from "$lib/stores/terminal";
+
+  import { Terminal } from "xterm";
+  import { FitAddon } from "xterm-addon-fit";
+
+  export let podName: string;
+  export let projectId: string;
+
+  const terminal = new Terminal({
+    convertEol: true,
+    disableStdin: false,
+    cursorBlink: true,
+    fontFamily: "monospace",
+    fontSize: 14,
+    theme: $darkTheme
+      ? {
+          foreground: "#d2d2d2",
+          background: "#2B3441",
+          cursor: "#adadad",
+          black: "#000000",
+          red: "#d81e00",
+          green: "#5ea702",
+          yellow: "#cfae00",
+          blue: "#427ab3",
+          magenta: "#89658e",
+          cyan: "#00a7aa",
+          white: "#dbded8",
+          brightBlack: "#686a66",
+          brightRed: "#f54235",
+          brightGreen: "#99e343",
+          brightYellow: "#fdeb61",
+          brightBlue: "#84b0d8",
+          brightMagenta: "#bc94b7",
+          brightCyan: "#37e6e8",
+          brightWhite: "#f1f1f0"
+        }
+      : {
+          foreground: "#d2d2d2",
+          background: "#2B3441",
+          cursor: "#adadad",
+          black: "#000000",
+          red: "#d81e00",
+          green: "#5ea702",
+          yellow: "#cfae00",
+          blue: "#427ab3",
+          magenta: "#89658e",
+          cyan: "#00a7aa",
+          white: "#dbded8",
+          brightBlack: "#686a66",
+          brightRed: "#f54235",
+          brightGreen: "#99e343",
+          brightYellow: "#fdeb61",
+          brightBlue: "#84b0d8",
+          brightMagenta: "#bc94b7",
+          brightCyan: "#37e6e8",
+          brightWhite: "#f1f1f0"
+        },
+    scrollOnUserInput: true
+  });
+
+  let socket: WebSocket;
+  const fitAddon = new FitAddon();
+  terminal.loadAddon(fitAddon);
+
+  const connectWebSocket = () => {
+    let host = window.location.host;
+    if (host.includes("localhost")) {
+      host = "localhost:8090";
+    }
+
+    const protocol = window.location.protocol === "https:" ? "wss" : "ws";
+    socket = new WebSocket(`${protocol}://${host}/ws/k8s/terminal`);
+
+    socket.binaryType = "arraybuffer";
+
+    socket.onopen = () => {
+      const message = JSON.stringify({ projectId, podName });
+      socket.send(message);
+      terminal.onData((data) => {
+        socket.send(new TextEncoder().encode(data));
+      });
+    };
+
+    socket.onmessage = (event: MessageEvent) => {
+      if (event.data instanceof ArrayBuffer) {
+        terminal.write(new TextDecoder().decode(event.data));
+      }
+    };
+
+    socket.onerror = (error: Event) => {
+      const errorMessage = (error as ErrorEvent).message || "An error occurred";
+      terminal.write(`\r\nWebSocket error: ${errorMessage}\r\n`);
+    };
+
+    socket.onclose = () => {
+      terminal.write("\r\nWebSocket closed. Attempting to reconnect...\r\n");
+      setTimeout(connectWebSocket, 5000);
+    };
+  };
+
+  terminal.onResize((size) => {
+    const terminal_size = {
+      cols: size.cols,
+      rows: size.rows,
+      y: size.rows,
+      x: size.cols
+    };
+    if (socket.readyState === WebSocket.OPEN) {
+      socket.send(new TextEncoder().encode("\x01" + JSON.stringify(terminal_size)));
+    }
+  });
+
+  let div: HTMLDivElement;
+
+  onMount(() => {
+    connectWebSocket();
+    terminal.open(div);
+    setTimeout(() => {
+      fitAddon.fit();
+    }, 300);
+  });
+
+  onDestroy(() => {
+    socket?.close();
+    terminal.dispose();
+  });
+
+  export const update_height = () => {
+    fitAddon.fit();
+  };
+
+  $: {
+    $terminal_size;
+    setTimeout(() => {
+      update_height();
+    }, 300);
+  }
+</script>
+
+<div bind:this={div} style="height: 100%; width: 100%;" />
+
+<style>
+  div {
+    height: 100%;
+    width: 100%;
+  }
+  div :global(.xterm) {
+    height: 100%;
+    padding: 5px;
+  }
+  div :global(.xterm-viewport) {
+    overflow-y: hidden !important;
+  }
+</style>
diff --git a/frontend/src/lib/components/map/Desktop.svelte b/frontend/src/lib/components/map/Desktop.svelte
new file mode 100644
index 00000000..00324d01
--- /dev/null
+++ b/frontend/src/lib/components/map/Desktop.svelte
@@ -0,0 +1,14 @@
+<script lang="ts">
+  import darkTheme from "$lib/stores/theme";
+  import type { ComponentType, SvelteComponent } from "svelte";
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  export let Console: ComponentType<SvelteComponent>;
+  export let podName: string;
+  export let projectId: string;
+</script>
+
+{#key $darkTheme}
+  <div class="h-full overflow-y-auto">
+    <svelte:component this={Console} {podName} {projectId} />
+  </div>
+{/key}
diff --git a/frontend/src/lib/components/map/PlaceholderComponent.svelte b/frontend/src/lib/components/map/PlaceholderComponent.svelte
new file mode 100644
index 00000000..37906373
--- /dev/null
+++ b/frontend/src/lib/components/map/PlaceholderComponent.svelte
@@ -0,0 +1,9 @@
+<div />
+
+<style>
+  div {
+    background-color: var(--sk-back-1);
+    width: 100%;
+    height: 100%;
+  }
+</style>
diff --git a/frontend/src/lib/components/map/ShellObject.svelte b/frontend/src/lib/components/map/ShellObject.svelte
new file mode 100644
index 00000000..455df4b4
--- /dev/null
+++ b/frontend/src/lib/components/map/ShellObject.svelte
@@ -0,0 +1,26 @@
+<script lang="ts">
+  import { onDestroy, onMount, type ComponentType, type SvelteComponent } from "svelte";
+  import PlaceholderComponent from "./PlaceholderComponent.svelte";
+  import Desktop from "./Desktop.svelte";
+  export let podName: string;
+  export let projectId: string;
+
+  let Console: ComponentType<SvelteComponent> = PlaceholderComponent;
+  let clear: number;
+  // let loadingCodeEditor = false;
+
+  onMount(async () => {
+    // loadingCodeEditor = true;
+    Console = (await import("$lib/components/map/Console.svelte")).default;
+  });
+
+  onDestroy(() => {
+    // loadingCodeEditor = false;
+    Console = PlaceholderComponent;
+    clearInterval(clear);
+  });
+</script>
+
+<div class="p-2 rounded-lg bg-gray-800">
+  <Desktop {Console} {podName} {projectId} />
+</div>
diff --git a/frontend/src/lib/stores/terminal.ts b/frontend/src/lib/stores/terminal.ts
new file mode 100644
index 00000000..b40162ed
--- /dev/null
+++ b/frontend/src/lib/stores/terminal.ts
@@ -0,0 +1,6 @@
+import { writable } from "svelte/store";
+
+export const terminal_size = writable({ height: 65 });
+
+// get pathnames from url
+export const pathname = writable(window.location.pathname);
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index 3291c55a..540a2680 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
-  import "../app.postcss";
-  import "../app.css";
+  import "../styles/app.postcss";
+  import "../styles/app.css";
+  import "../styles/xterm.css";
   import { metadata } from "$lib/stores/metadata";
   import { site } from "$lib/config";
   import { beforeNavigate } from "$app/navigation";
diff --git a/frontend/src/routes/app/projects/[id]/deployments/[id]/map/+page.svelte b/frontend/src/routes/app/projects/[id]/deployments/[id]/map/+page.svelte
index 7d87f02e..06d21a65 100644
--- a/frontend/src/routes/app/projects/[id]/deployments/[id]/map/+page.svelte
+++ b/frontend/src/routes/app/projects/[id]/deployments/[id]/map/+page.svelte
@@ -21,6 +21,7 @@
     Lock,
     NetworkIcon,
     ScrollText,
+    TerminalSquare,
     Trash,
     X
   } from "lucide-svelte";
@@ -29,6 +30,8 @@
   import EventStream from "$lib/components/map/EventStream.svelte";
   import toast from "svelte-french-toast";
   import selectedDeploymentId from "$lib/stores/deployment";
+  import ShellObject from "$lib/components/map/ShellObject.svelte";
+  import selectedProjectId from "$lib/stores/project";
 
   let transitionParamsRight = {
     x: 320,
@@ -599,6 +602,13 @@
             </div>
             <LogStream podName={$selectedNode?.name ?? ""} />
           </TabItem>
+          <TabItem>
+            <div slot="title" class="flex items-center gap-2">
+              <TerminalSquare />
+              Shell
+            </div>
+            <ShellObject podName={$selectedNode?.name ?? ""} projectId={$selectedProjectId} />
+          </TabItem>
           <TabItem>
             <div slot="title" class="flex items-center gap-2">
               <Bell />
diff --git a/frontend/src/app.css b/frontend/src/styles/app.css
similarity index 100%
rename from frontend/src/app.css
rename to frontend/src/styles/app.css
diff --git a/frontend/src/app.postcss b/frontend/src/styles/app.postcss
similarity index 100%
rename from frontend/src/app.postcss
rename to frontend/src/styles/app.postcss
diff --git a/frontend/src/styles/xterm.css b/frontend/src/styles/xterm.css
new file mode 100644
index 00000000..55896122
--- /dev/null
+++ b/frontend/src/styles/xterm.css
@@ -0,0 +1,201 @@
+/**
+ * Copyright (c) 2014 The xterm.js authors. All rights reserved.
+ * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)
+ * https://github.com/chjj/term.js
+ * @license MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Originally forked from (with the author's permission):
+ *   Fabrice Bellard's javascript vt100 for jslinux:
+ *   http://bellard.org/jslinux/
+ *   Copyright (c) 2011 Fabrice Bellard
+ *   The original design remains. The terminal itself
+ *   has been extended to include xterm CSI codes, among
+ *   other features.
+ */
+
+/**
+ *  Default styles for xterm.js
+ */
+
+.xterm {
+    cursor: text;
+    position: relative;
+    user-select: none;
+    -ms-user-select: none;
+    -webkit-user-select: none;
+}
+
+.xterm.focus,
+.xterm:focus {
+    outline: none;
+}
+
+.xterm .xterm-helpers {
+    position: absolute;
+    top: 0;
+    /**
+     * The z-index of the helpers must be higher than the canvases in order for
+     * IMEs to appear on top.
+     */
+    z-index: 5;
+}
+
+.xterm .xterm-helper-textarea {
+    padding: 0;
+    border: 0;
+    margin: 0;
+    /* Move textarea out of the screen to the far left, so that the cursor is not visible */
+    position: absolute;
+    opacity: 0;
+    left: -9999em;
+    top: 0;
+    width: 0;
+    height: 0;
+    z-index: -5;
+    /** Prevent wrapping so the IME appears against the textarea at the correct position */
+    white-space: nowrap;
+    overflow: hidden;
+    resize: none;
+}
+
+.xterm .composition-view {
+    /* TODO: Composition position got messed up somewhere */
+    background: #000;
+    color: #fff;
+    display: none;
+    position: absolute;
+    white-space: nowrap;
+    z-index: 1;
+}
+
+.xterm .composition-view.active {
+    display: block;
+}
+
+.xterm .xterm-viewport {
+    /* On OS X this is required in order for the scroll bar to appear fully opaque */
+    background-color: #000;
+    overflow-y: scroll;
+    cursor: default;
+    position: absolute;
+    right: 0;
+    left: 0;
+    top: 0;
+    bottom: 0;
+}
+
+.xterm .xterm-screen {
+    position: relative;
+}
+
+.xterm .xterm-screen canvas {
+    position: absolute;
+    left: 0;
+    top: 0;
+}
+
+.xterm .xterm-scroll-area {
+    visibility: hidden;
+}
+
+.xterm-char-measure-element {
+    display: inline-block;
+    visibility: hidden;
+    position: absolute;
+    top: 0;
+    left: -9999em;
+    line-height: normal;
+}
+
+.xterm.enable-mouse-events {
+    /* When mouse events are enabled (eg. tmux), revert to the standard pointer cursor */
+    cursor: default;
+}
+
+.xterm.xterm-cursor-pointer,
+.xterm .xterm-cursor-pointer {
+    cursor: pointer;
+}
+
+.xterm.column-select.focus {
+    /* Column selection mode */
+    cursor: crosshair;
+}
+
+.xterm .xterm-accessibility,
+.xterm .xterm-message {
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    z-index: 10;
+    color: transparent;
+}
+
+.xterm .live-region {
+    position: absolute;
+    left: -9999px;
+    width: 1px;
+    height: 1px;
+    overflow: hidden;
+}
+
+.xterm-dim {
+    opacity: 0.5;
+}
+
+.xterm-underline-1 {
+    text-decoration: underline;
+}
+.xterm-underline-2 {
+    text-decoration: double underline;
+}
+.xterm-underline-3 {
+    text-decoration: wavy underline;
+}
+.xterm-underline-4 {
+    text-decoration: dotted underline;
+}
+.xterm-underline-5 {
+    text-decoration: dashed underline;
+}
+
+.xterm-strikethrough {
+    text-decoration: line-through;
+}
+
+.xterm-screen .xterm-decoration-container .xterm-decoration {
+    z-index: 6;
+    position: absolute;
+}
+
+.xterm-decoration-overview-ruler {
+    z-index: 7;
+    position: absolute;
+    top: 0;
+    right: 0;
+    pointer-events: none;
+}
+
+.xterm-decoration-top {
+    z-index: 2;
+    position: relative;
+}
diff --git a/pocketbase/go.mod b/pocketbase/go.mod
index 1662a27e..e4bc4e6d 100644
--- a/pocketbase/go.mod
+++ b/pocketbase/go.mod
@@ -38,9 +38,11 @@ require (
 	github.com/klauspost/compress v1.16.5 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/moby/spdystream v0.2.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
 	github.com/ncruces/go-strftime v0.1.9 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
diff --git a/pocketbase/go.sum b/pocketbase/go.sum
index 972921cb..584b6a8f 100644
--- a/pocketbase/go.sum
+++ b/pocketbase/go.sum
@@ -190,10 +190,18 @@ github.com/google/wire v0.6.0 h1:HBkoIh4BdSxoyo9PveV8giw7ZsaBOvzWKfcg/6MrVwI=
 github.com/google/wire v0.6.0/go.mod h1:F4QhpQ9EDIdJ1Mbop/NZBRB+5yrR6qg3BnctaoUk6NA=
 github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs=
 github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
+<<<<<<< HEAD
 github.com/googleapis/gax-go/v2 v2.12.5 h1:8gw9KZK8TiVKB6q3zHY3SBzLnrGp6HQjyfYBYGmXdxA=
 github.com/googleapis/gax-go/v2 v2.12.5/go.mod h1:BUDKcWo+RaKq5SC9vVYL0wLADa3VcfswbOMMRmB9H3E=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+=======
+github.com/googleapis/gax-go/v2 v2.12.4 h1:9gWcmF85Wvq4ryPFvGFaOgPIs1AQX0d0bcbGw4Z96qg=
+github.com/googleapis/gax-go/v2 v2.12.4/go.mod h1:KYEYLorsnIGDi/rPC8b5TdlB9kbKoFubselGIoBMCwI=
+github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.2 h1:qoW6V1GT3aZxybsbC6oLnailWnB+qTMVwMreOso9XUw=
+github.com/gorilla/websocket v1.5.2/go.mod h1:0n9H61RBAcf5/38py2MCYbxzPIY9rOkpvvMT24Rqs30=
+>>>>>>> 6e6ca8b (feat: first attempt of terminal)
 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
 github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u7lxST/RaJw+cv273q79D81Xbog=
@@ -241,6 +249,8 @@ github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQ
 github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8=
+github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -248,6 +258,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
 github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
 github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY=
@@ -453,10 +465,23 @@ gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0=
 gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+<<<<<<< HEAD
 k8s.io/api v0.30.2 h1:+ZhRj+28QT4UOH+BKznu4CBgPWgkXO7XAvMcMl0qKvI=
 k8s.io/api v0.30.2/go.mod h1:ULg5g9JvOev2dG0u2hig4Z7tQ2hHIuS+m8MNZ+X6EmI=
 k8s.io/apimachinery v0.30.2 h1:fEMcnBj6qkzzPGSVsAZtQThU62SmQ4ZymlXRC5yFSCg=
 k8s.io/apimachinery v0.30.2/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
+=======
+k8s.io/api v0.30.1 h1:kCm/6mADMdbAxmIh0LBjS54nQBE+U4KmbCfIkF5CpJY=
+k8s.io/api v0.30.1/go.mod h1:ddbN2C0+0DIiPntan/bye3SW3PdwLa11/0yqwvuRrJM=
+k8s.io/api v0.30.2 h1:+ZhRj+28QT4UOH+BKznu4CBgPWgkXO7XAvMcMl0qKvI=
+k8s.io/api v0.30.2/go.mod h1:ULg5g9JvOev2dG0u2hig4Z7tQ2hHIuS+m8MNZ+X6EmI=
+k8s.io/apimachinery v0.30.1 h1:ZQStsEfo4n65yAdlGTfP/uSHMQSoYzU/oeEbkmF7P2U=
+k8s.io/apimachinery v0.30.1/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
+k8s.io/apimachinery v0.30.2 h1:fEMcnBj6qkzzPGSVsAZtQThU62SmQ4ZymlXRC5yFSCg=
+k8s.io/apimachinery v0.30.2/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
+k8s.io/client-go v0.30.1 h1:uC/Ir6A3R46wdkgCV3vbLyNOYyCJ8oZnjtJGKfytl/Q=
+k8s.io/client-go v0.30.1/go.mod h1:wrAqLNs2trwiCH/wxxmT/x3hKVH9PuV0GGW0oDoHVqc=
+>>>>>>> 6e6ca8b (feat: first attempt of terminal)
 k8s.io/client-go v0.30.2 h1:sBIVJdojUNPDU/jObC+18tXWcTJVcwyqS9diGdWHk50=
 k8s.io/client-go v0.30.2/go.mod h1:JglKSWULm9xlJLx4KCkfLLQ7XwtlbflV6uFFSHTMgVs=
 k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
diff --git a/pocketbase/main.go b/pocketbase/main.go
index 5100bffe..047c0f89 100644
--- a/pocketbase/main.go
+++ b/pocketbase/main.go
@@ -174,6 +174,9 @@ func main() {
 		// websocket for rollout events
 		e.Router.GET("/ws/k8s/events", watcher.WsK8sRolloutEventsHandler)
 
+		// websocket for terminal of a pod attached
+		e.Router.GET("/ws/k8s/terminal", watcher.WsK8sTerminalHandler)
+
 		return nil
 	})
 
diff --git a/pocketbase/pkg/k8s/pod.go b/pocketbase/pkg/k8s/pod.go
index 1cbec80d..de1850cb 100644
--- a/pocketbase/pkg/k8s/pod.go
+++ b/pocketbase/pkg/k8s/pod.go
@@ -1,7 +1,84 @@
 package k8s
 
-import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+import (
+	"log"
 
+	"github.com/gorilla/websocket"
+	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/tools/remotecommand"
+)
+
+// DeletePod is a helper function to delete a pod
 func DeletePod(namespace string, podName string) error {
 	return Clientset.CoreV1().Pods(namespace).Delete(Ctx, podName, metav1.DeleteOptions{})
 }
+
+// WatchK8sTerminalAndSendUpdates watches the Kubernetes terminal and sends updates over WebSocket
+func WatchK8sTerminalAndSendUpdates(conn *websocket.Conn, projectId string, podName string) {
+	log.Printf("WatchK8sTerminalAndSendUpdates called with projectId=%s, podName=%s", projectId, podName)
+
+	req := Clientset.CoreV1().RESTClient().Post().
+		Resource("pods").
+		Name(podName).
+		Namespace(projectId).
+		SubResource("exec").
+		VersionedParams(&v1.PodExecOptions{
+			Command: []string{"/bin/sh"},
+			Stdin:   true,
+			Stdout:  true,
+			Stderr:  true,
+			TTY:     true,
+		}, scheme.ParameterCodec)
+
+	exec, err := remotecommand.NewSPDYExecutor(Kubeconfig, "POST", req.URL())
+	if err != nil {
+		log.Println("Error creating executor:", err)
+		return
+	}
+
+	streamOptions := remotecommand.StreamOptions{
+		Stdin:  &wsStream{Conn: conn},
+		Stdout: &wsStream{Conn: conn},
+		Stderr: &wsStream{Conn: conn},
+		Tty:    true,
+	}
+
+	err = exec.StreamWithContext(Ctx, streamOptions)
+	if err != nil {
+		log.Println("Error starting executor:", err)
+		return
+	}
+}
+
+type wsStream struct {
+	Conn    *websocket.Conn
+	readBuf []byte
+}
+
+func (w *wsStream) Read(p []byte) (n int, err error) {
+	if len(w.readBuf) == 0 {
+		_, message, err := w.Conn.ReadMessage()
+		if err != nil {
+			log.Println("Error reading message from WebSocket:", err)
+			return 0, err
+		}
+		w.readBuf = append(w.readBuf, message...)
+		log.Printf("Read %d bytes from WebSocket: %s", len(message), message)
+	}
+
+	n = copy(p, w.readBuf)
+	w.readBuf = w.readBuf[n:]
+	return n, nil
+}
+
+func (w *wsStream) Write(p []byte) (n int, err error) {
+	err = w.Conn.WriteMessage(websocket.TextMessage, p)
+	if err != nil {
+		log.Println("Error writing message to WebSocket:", err)
+		return 0, err
+	}
+	log.Printf("Sent output: %s", string(p))
+	return len(p), nil
+}
diff --git a/pocketbase/pkg/k8s/watch.go b/pocketbase/pkg/k8s/watch.go
index c075715d..6353d8a7 100644
--- a/pocketbase/pkg/k8s/watch.go
+++ b/pocketbase/pkg/k8s/watch.go
@@ -280,13 +280,11 @@ func WatchK8sLogsAndSendUpdates(ws *websocket.Conn, projectId string, podName st
 					return
 				}
 				ws.WriteMessage(websocket.TextMessage, []byte("Error reading from readCloser: "+err.Error()))
-				log.Printf("Error reading from readCloser: %v", err)
 				return
 			}
 
 			// Send the message over WebSocket
 			if err := ws.WriteMessage(websocket.TextMessage, buf[:n]); err != nil {
-				log.Printf("Error sending logs over WebSocket: %v", err)
 				return
 			}
 		}
diff --git a/pocketbase/pkg/watcher/config.go b/pocketbase/pkg/watcher/config.go
index 524ff7d2..6bf1a39f 100644
--- a/pocketbase/pkg/watcher/config.go
+++ b/pocketbase/pkg/watcher/config.go
@@ -7,6 +7,8 @@ import (
 )
 
 var Upgrader = websocket.Upgrader{
+	ReadBufferSize:  1024,
+	WriteBufferSize: 1024,
 	CheckOrigin: func(r *http.Request) bool {
 		return true // Consider your CORS policy here
 	},
diff --git a/pocketbase/pkg/watcher/logs.go b/pocketbase/pkg/watcher/logs.go
index d1d150e2..013cf53f 100644
--- a/pocketbase/pkg/watcher/logs.go
+++ b/pocketbase/pkg/watcher/logs.go
@@ -50,7 +50,6 @@ func WsK8sRolloutLogsHandler(c echo.Context) error {
 	// Await for close event in the main function to properly manage connection lifecycle
 	_, _, err = ws.ReadMessage() // This blocks until client disconnects or errors out
 	if err != nil {
-		log.Println("WebSocket connection closed with error:", err)
 	}
 
 	return nil
diff --git a/pocketbase/pkg/watcher/terminal.go b/pocketbase/pkg/watcher/terminal.go
new file mode 100644
index 00000000..07e94df7
--- /dev/null
+++ b/pocketbase/pkg/watcher/terminal.go
@@ -0,0 +1,58 @@
+package watcher
+
+import (
+	"encoding/json"
+	"log"
+
+	"github.com/gorilla/websocket"
+	"github.com/janlauber/one-click/pkg/k8s"
+	"github.com/labstack/echo/v5"
+)
+
+type RolloutTerminalRequest struct {
+	ProjectId string `json:"projectId"`
+	PodName   string `json:"podName"`
+}
+
+func WsK8sTerminalHandler(c echo.Context) error {
+	conn, err := Upgrader.Upgrade(c.Response(), c.Request(), nil)
+	if err != nil {
+		log.Println("WebSocket upgrade error:", err)
+		return err
+	}
+	defer func() {
+		conn.Close()
+		log.Println("WebSocket connection closed")
+	}()
+
+	_, msg, err := conn.ReadMessage()
+	if err != nil {
+		log.Println("WebSocket read error:", err)
+		return err
+	}
+
+	log.Printf("Received initial message: %s", string(msg))
+
+	var request RolloutTerminalRequest
+	err = json.Unmarshal(msg, &request)
+	if err != nil {
+		log.Println("WebSocket unmarshal error:", err)
+		conn.WriteMessage(websocket.TextMessage, []byte("{\"error\":\"Invalid request format\"}"))
+		return err
+	}
+
+	log.Printf("Parsed request: projectId=%s, podName=%s", request.ProjectId, request.PodName)
+
+	go k8s.WatchK8sTerminalAndSendUpdates(conn, request.ProjectId, request.PodName)
+
+	for {
+		_, msg, err := conn.ReadMessage()
+		if err != nil {
+			log.Println("WebSocket connection closed:", err)
+			break
+		}
+		log.Printf("WebSocket received message: %s", string(msg))
+	}
+
+	return nil
+}