diff --git a/README.md b/README.md
index 30368126..08837cdc 100644
--- a/README.md
+++ b/README.md
@@ -106,6 +106,7 @@ This is the official repository for the Tipi App Store. It contains all the apps
 - [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
+- [Nginx](https://github.com/nginx/nginx) - A simple web server to test your tipi install
 - [Nitter](https://github.com/zedeus/nitter) - Alternative Twitter front-end
 - [NocoDB](https://github.com/nocodb/nocodb) - Open Source Airtable Alternative
 - [Node-RED](https://github.com/node-red/node-red) - Low-code programming for event-driven applications
diff --git a/apps/nginx/config.json b/apps/nginx/config.json
new file mode 100644
index 00000000..4421fd48
--- /dev/null
+++ b/apps/nginx/config.json
@@ -0,0 +1,18 @@
+{
+    "name": "Nginx",
+    "available": true,
+    "port": 8754,
+    "exposable": true,
+    "id": "nginx",
+    "description": "Simple webserver to test your tipi install. An alternative to the hello-world app.",
+    "tipi_version": 1,
+    "version": "1.25.3",
+    "categories": ["utilities"],
+    "short_desc": "Open-source simple and fast web server.",
+    "author": "nginx",
+    "source": "https://github.com/nginx/nginx",
+    "website": "https://www.nginx.com/",
+    "form_fields": [],
+    "supported_architectures": ["arm64", "amd64"]
+  }
+  
\ No newline at end of file
diff --git a/apps/nginx/docker-compose.yml b/apps/nginx/docker-compose.yml
new file mode 100644
index 00000000..44ccde2c
--- /dev/null
+++ b/apps/nginx/docker-compose.yml
@@ -0,0 +1,35 @@
+version: "3.9"
+services:
+  nginx:
+    image: nginx:1.25.3
+    container_name: nginx
+    restart: unless-stopped
+    ports:
+      - ${APP_PORT}:80
+    networks:
+      - tipi_main_network
+    labels:
+      # Main
+      traefik.enable: true
+      traefik.http.middlewares.nginx-web-redirect.redirectscheme.scheme: https
+      traefik.http.services.nginx.loadbalancer.server.port: 80
+      # Web
+      traefik.http.routers.nginx-insecure.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.nginx-insecure.entrypoints: web
+      traefik.http.routers.nginx-insecure.service: nginx
+      traefik.http.routers.nginx-insecure.middlewares: nginx-web-redirect
+      # Websecure
+      traefik.http.routers.nginx.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.nginx.entrypoints: websecure
+      traefik.http.routers.nginx.service: nginx
+      traefik.http.routers.nginx.tls.certresolver: myresolver
+      # Local domain
+      traefik.http.routers.nginx-local-insecure.rule: Host(`nginx.${LOCAL_DOMAIN}`)
+      traefik.http.routers.nginx-local-insecure.entrypoints: web
+      traefik.http.routers.nginx-local-insecure.service: nginx
+      traefik.http.routers.nginx-local-insecure.middlewares: nginx-web-redirect
+      # Local domain secure
+      traefik.http.routers.nginx-local.rule: Host(`nginx.${LOCAL_DOMAIN}`)
+      traefik.http.routers.nginx-local.entrypoints: websecure
+      traefik.http.routers.nginx-local.service: nginx
+      traefik.http.routers.nginx-local.tls: true
\ No newline at end of file
diff --git a/apps/nginx/metadata/description.md b/apps/nginx/metadata/description.md
new file mode 100644
index 00000000..9836fdd6
--- /dev/null
+++ b/apps/nginx/metadata/description.md
@@ -0,0 +1,3 @@
+## Nginx 
+
+A simple and lightweight web server to test that your tipi install works.
\ No newline at end of file
diff --git a/apps/nginx/metadata/logo.jpg b/apps/nginx/metadata/logo.jpg
new file mode 100644
index 00000000..90fcfc6c
Binary files /dev/null and b/apps/nginx/metadata/logo.jpg differ