diff --git a/apps/nas-samba/config.json b/apps/nas-samba/config.json
index 18ea517..f760ba6 100644
--- a/apps/nas-samba/config.json
+++ b/apps/nas-samba/config.json
@@ -3,14 +3,15 @@
   "name": "NAS Samba",
   "id": "nas-samba",
   "available": true,
-  "exposable": false,
+  "port": 9090,
+  "exposable": true,
   "dynamic_config": true,
-  "no_gui": true,
+  "no_gui": false,
   "tipi_version": 1,
   "version": "latest",
   "categories": ["network", "utilities"],
-  "description": "Samba SMB/CIFS file share for the /nas drive. Connect at \\\\192.168.0.15\\data with username alexz.",
-  "short_desc": "SMB file share for the NAS drive",
+  "description": "Samba SMB/CIFS file share for the /nas drive with Cockpit web UI for server management. Connect via SMB at \\\\192.168.0.15\\data with username alexz.",
+  "short_desc": "NAS file share with Cockpit management UI",
   "author": "servercontainers",
   "source": "https://github.com/ServerContainers/samba",
   "form_fields": [
diff --git a/apps/nas-samba/docker-compose.json b/apps/nas-samba/docker-compose.json
index 70628fa..bc63d94 100644
--- a/apps/nas-samba/docker-compose.json
+++ b/apps/nas-samba/docker-compose.json
@@ -5,7 +5,7 @@
     {
       "name": "nas-samba",
       "image": "servercontainers/samba:latest",
-      "isMain": true,
+      "isMain": false,
       "hostname": "nas",
       "addPorts": [
         {
@@ -41,6 +41,36 @@
           "value": "[data]; path=/nas; valid users=alexz; browsable=yes; writable=yes; create mask=0664; directory mask=0775"
         }
       ]
+    },
+    {
+      "name": "nas-cockpit",
+      "image": "cockpit/ws:latest",
+      "isMain": true,
+      "internalPort": 9090,
+      "privileged": true,
+      "volumes": [
+        {
+          "hostPath": "/run/systemd/private",
+          "containerPath": "/run/systemd/private",
+          "readOnly": false
+        },
+        {
+          "hostPath": "/run/dbus",
+          "containerPath": "/run/dbus",
+          "readOnly": false
+        },
+        {
+          "hostPath": "/",
+          "containerPath": "/host",
+          "readOnly": false
+        }
+      ],
+      "environment": [
+        {
+          "key": "COCKPIT_KUBE_INSECURE",
+          "value": "true"
+        }
+      ]
     }
   ]
 }