diff --git a/README.md b/README.md
index 74b00ef3..1f989ced 100644
--- a/README.md
+++ b/README.md
@@ -101,6 +101,7 @@ This is the official repository for the Tipi App Store. It contains all the apps
 - [Mylar3](https://github.com/mylar3/mylar3) - Mylar3 is an automated Comic Book downloader (cbr/cbz) for use with NZB and torrents written in python.
 - [n8n](https://github.com/n8n-io/n8n) - Workflow Automation Tool
 - [Navidrome](https://github.com/navidrome/navidrome) - A selfhosted music server
+- [Netboot.xyz](https://github.com/netbootxyz/netboot.xyz) - Your favorite operating systems in one place!
 - [Netdata](https://github.com/netdata/netdata) - Open-source, real-time, performance and health monitoring.
 - [Nextcloud](https://github.com/nextcloud/server) - A safe home for all your data
 - [Nitter](https://github.com/zedeus/nitter) - Alternative Twitter front-end
diff --git a/apps/netbootxyz/config.json b/apps/netbootxyz/config.json
new file mode 100644
index 00000000..683e73a8
--- /dev/null
+++ b/apps/netbootxyz/config.json
@@ -0,0 +1,20 @@
+{
+    "name": "Netboot.xyz",
+    "available": true,
+    "port": 8675,
+    "exposable": true,
+    "id": "netbootxyz",
+    "description": "Your favorite operating systems in one place. A network-based bootable operating system installer based on iPXE.",
+    "tipi_version": 1,
+    "version": "0.6.9",
+    "categories": [
+      "utilities"
+    ],
+    "short_desc": "Your favorite operating systems in one place.",
+    "author": "netboot.xyz",
+    "source": "https://github.com/netbootxyz/netboot.xyz",
+    "website": "https://netboot.xyz/",
+    "form_fields": [],
+    "supported_architectures": ["arm64", "amd64"]
+  }
+  
diff --git a/apps/netbootxyz/docker-compose.yml b/apps/netbootxyz/docker-compose.yml
new file mode 100644
index 00000000..b2209c80
--- /dev/null
+++ b/apps/netbootxyz/docker-compose.yml
@@ -0,0 +1,39 @@
+version: "3.7"
+services:
+  netbootxyz:
+    image: lscr.io/linuxserver/netbootxyz:0.6.9
+    container_name: netbootxyz
+    volumes:
+      - ${APP_DATA_DIR}/data/config:/config
+      - ${APP_DATA_DIR}/data/assets:/assets
+    ports:
+      - ${APP_PORT}:3000
+      - 69:69/udp
+    restart: unless-stopped
+    networks:
+      - tipi_main_network
+    labels:
+      # Main
+      traefik.enable: true
+      traefik.http.middlewares.netbootxyz-web-redirect.redirectscheme.scheme: https
+      traefik.http.services.netbootxyz.loadbalancer.server.port: 19999
+      # Web
+      traefik.http.routers.netbootxyz-insecure.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.netbootxyz-insecure.entrypoints: web
+      traefik.http.routers.netbootxyz-insecure.service: netbootxyz
+      traefik.http.routers.netbootxyz-insecure.middlewares: netbootxyz-web-redirect
+      # Websecure
+      traefik.http.routers.netbootxyz.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.netbootxyz.entrypoints: websecure
+      traefik.http.routers.netbootxyz.service: netbootxyz
+      traefik.http.routers.netbootxyz.tls.certresolver: myresolver
+      # Local domain
+      traefik.http.routers.netbootxyz-local-insecure.rule: Host(`netbootxyz.${LOCAL_DOMAIN}`)
+      traefik.http.routers.netbootxyz-local-insecure.entrypoints: web
+      traefik.http.routers.netbootxyz-local-insecure.service: netbootxyz
+      traefik.http.routers.netbootxyz-local-insecure.middlewares: netbootxyz-web-redirect
+      # Local domain secure
+      traefik.http.routers.netbootxyz-local.rule: Host(`netbootxyz.${LOCAL_DOMAIN}`)
+      traefik.http.routers.netbootxyz-local.entrypoints: websecure
+      traefik.http.routers.netbootxyz-local.service: netbootxyz
+      traefik.http.routers.netbootxyz-local.tls: true
diff --git a/apps/netbootxyz/metadata/description.md b/apps/netbootxyz/metadata/description.md
new file mode 100644
index 00000000..222968f2
--- /dev/null
+++ b/apps/netbootxyz/metadata/description.md
@@ -0,0 +1,5 @@
+## netboot.xyz
+
+Your favorite operating systems in one place!
+
+![netboot.xyz menu](https://netboot.xyz/images/netboot.xyz.gif)
\ No newline at end of file
diff --git a/apps/netbootxyz/metadata/logo.jpg b/apps/netbootxyz/metadata/logo.jpg
new file mode 100644
index 00000000..784f5d0b
Binary files /dev/null and b/apps/netbootxyz/metadata/logo.jpg differ