diff --git a/apps/nas-samba/config.json b/apps/nas-samba/config.json
new file mode 100644
index 0000000..18ea517
--- /dev/null
+++ b/apps/nas-samba/config.json
@@ -0,0 +1,46 @@
+{
+  "$schema": "../app-info-schema.json",
+  "name": "NAS Samba",
+  "id": "nas-samba",
+  "available": true,
+  "exposable": false,
+  "dynamic_config": true,
+  "no_gui": true,
+  "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",
+  "author": "servercontainers",
+  "source": "https://github.com/ServerContainers/samba",
+  "form_fields": [
+    {
+      "type": "password",
+      "label": "SMB Password",
+      "env_variable": "SMB_PASSWORD",
+      "required": true,
+      "hint": "Password for user alexz"
+    },
+    {
+      "type": "text",
+      "label": "NAS Host Path",
+      "env_variable": "NAS_PATH",
+      "required": true,
+      "default": "/nas",
+      "hint": "Host path to share via SMB"
+    },
+    {
+      "type": "text",
+      "label": "Bind IP",
+      "env_variable": "BIND_IP",
+      "required": true,
+      "default": "192.168.0.15",
+      "hint": "IP address to bind SMB ports to"
+    }
+  ],
+  "supported_architectures": ["arm64", "amd64"],
+  "created_at": 1741536000000,
+  "updated_at": 1741536000000,
+  "deprecated": false,
+  "min_tipi_version": "4.5.0"
+}
diff --git a/apps/nas-samba/docker-compose.json b/apps/nas-samba/docker-compose.json
new file mode 100644
index 0000000..3cb3e91
--- /dev/null
+++ b/apps/nas-samba/docker-compose.json
@@ -0,0 +1,50 @@
+{
+  "schemaVersion": 2,
+  "$schema": "https://schemas.runtipi.io/dynamic-compose.json",
+  "services": [
+    {
+      "name": "nas-samba",
+      "image": "servercontainers/samba:latest",
+      "isMain": true,
+      "hostname": "nas",
+      "addPorts": [
+        {
+          "hostPort": 445,
+          "containerPort": 445,
+          "protocol": "tcp",
+          "hostIp": "${BIND_IP:-192.168.0.15}"
+        },
+        {
+          "hostPort": 139,
+          "containerPort": 139,
+          "protocol": "tcp",
+          "hostIp": "${BIND_IP:-192.168.0.15}"
+        }
+      ],
+      "volumes": [
+        {
+          "hostPath": "${NAS_PATH:-/nas}",
+          "containerPath": "/nas"
+        }
+      ],
+      "environment": [
+        {
+          "key": "ACCOUNT_alexz",
+          "value": "${SMB_PASSWORD}"
+        },
+        {
+          "key": "UID_alexz",
+          "value": "1000"
+        },
+        {
+          "key": "GROUP_alexz",
+          "value": "users"
+        },
+        {
+          "key": "SAMBA_VOLUME_CONFIG_data",
+          "value": "[data]; path=/nas; valid users=alexz; browsable=yes; writable=yes; create mask=0664; directory mask=0775"
+        }
+      ]
+    }
+  ]
+}
diff --git a/apps/nas-samba/metadata/logo.jpg b/apps/nas-samba/metadata/logo.jpg
new file mode 100644
index 0000000..7e70eba
Binary files /dev/null and b/apps/nas-samba/metadata/logo.jpg differ