diff --git a/src/warnet/cli/k8s.py b/src/warnet/cli/k8s.py
new file mode 100644
index 000000000..a8c7d2da6
--- /dev/null
+++ b/src/warnet/cli/k8s.py
@@ -0,0 +1,99 @@
+import os
+import subprocess
+
+from importlib.resources import files
+
+from kubernetes import client, config
+from kubernetes.dynamic import DynamicClient
+
+
+WAR_MANIFESTS = files("manifests")
+
+def get_static_client():
+    config.load_kube_config()
+    return client.CoreV1Api()
+
+def get_dynamic_client():
+    config.load_kube_config()
+    return DynamicClient(client.ApiClient())
+
+def get_pods():
+    sclient = get_static_client()
+    return sclient.list_namespaced_pod("warnet")
+
+def run_command(command, stream_output=False, env=None):
+    # Merge the current environment with the provided env
+    full_env = os.environ.copy()
+    if env:
+        # Convert all env values to strings (only a safeguard)
+        env = {k: str(v) for k, v in env.items()}
+        full_env.update(env)
+
+    if stream_output:
+        process = subprocess.Popen(
+            ["/bin/bash", "-c", command],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            text=True,
+            bufsize=1,
+            universal_newlines=True,
+            env=full_env,
+        )
+
+        for line in iter(process.stdout.readline, ""):
+            print(line, end="")
+
+        process.stdout.close()
+        return_code = process.wait()
+
+        if return_code != 0:
+            print(f"Command failed with return code {return_code}")
+            return False
+        return True
+    else:
+        result = subprocess.run(
+            command, shell=True, capture_output=True, text=True, executable="/bin/bash"
+        )
+        if result.returncode != 0:
+            print(f"Error: {result.stderr}")
+            return False
+        print(result.stdout)
+        return True
+
+
+def set_kubectl_context(namespace: str):
+    """
+    Set the default kubectl context to the specified namespace.
+    """
+    command = f"kubectl config set-context --current --namespace={namespace}"
+    result = run_command(command, stream_output=True)
+    if result:
+        print(f"Kubectl context set to namespace: {namespace}")
+    else:
+        print(f"Failed to set kubectl context to namespace: {namespace}")
+    return result
+
+
+def deploy_base_configurations():
+    base_configs = [
+        "namespace.yaml",
+        "rbac-config.yaml",
+    ]
+
+    for config in base_configs:
+        command = f"kubectl apply -f {WAR_MANIFESTS}/{config}"
+        if not run_command(command, stream_output=True):
+            print(f"Failed to apply {config}")
+            return False
+    return True
+
+
+def apply_kubernetes_yaml(yaml_file: str):
+    command = f"kubectl apply -f {yaml_file}"
+    return run_command(command, stream_output=True)
+
+
+def delete_namespace(namespace: str):
+    command = f"kubectl delete namespace {namespace}"
+    return run_command(command, stream_output=True)
+
diff --git a/src/warnet/cli/network.py b/src/warnet/cli/network.py
index 3fe3a6879..587101d23 100644
--- a/src/warnet/cli/network.py
+++ b/src/warnet/cli/network.py
@@ -8,7 +8,13 @@
 import yaml
 from rich import print
 
-from .util import run_command
+from .k8s import (
+    run_command,
+    set_kubectl_context,
+    deploy_base_configurations,
+    apply_kubernetes_yaml,
+    delete_namespace
+)
 
 DEFAULT_GRAPH_FILE = files("graphs").joinpath("default.graphml")
 WAR_MANIFESTS = files("manifests")
@@ -225,43 +231,6 @@ def generate_node_config(node: int, data: dict) -> str:
     return f"{base_config}\n{node_specific_config}"
 
 
-def set_kubectl_context(namespace: str):
-    """
-    Set the default kubectl context to the specified namespace.
-    """
-    command = f"kubectl config set-context --current --namespace={namespace}"
-    result = run_command(command, stream_output=True)
-    if result:
-        print(f"Kubectl context set to namespace: {namespace}")
-    else:
-        print(f"Failed to set kubectl context to namespace: {namespace}")
-    return result
-
-
-def deploy_base_configurations():
-    base_configs = [
-        "namespace.yaml",
-        "rbac-config.yaml",
-    ]
-
-    for config in base_configs:
-        command = f"kubectl apply -f {WAR_MANIFESTS}/{config}"
-        if not run_command(command, stream_output=True):
-            print(f"Failed to apply {config}")
-            return False
-    return True
-
-
-def apply_kubernetes_yaml(yaml_file: str):
-    command = f"kubectl apply -f {yaml_file}"
-    return run_command(command, stream_output=True)
-
-
-def delete_namespace(namespace: str):
-    command = f"kubectl delete namespace {namespace}"
-    return run_command(command, stream_output=True)
-
-
 def setup_logging_helm():
     """
     Run the required Helm commands for setting up Grafana, Prometheus, and Loki.