diff --git a/README.md b/README.md
index 8e8ca3f9..dffa8d25 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ This is the official repository for the Tipi App Store. It contains all the apps
 - [Deluge](https://github.com/linuxserver/docker-deluge) - Deluge is a lightweight, Free Software, cross-platform BitTorrent client
 - [DokuWiki](https://github.com/dokuwiki/dokuwiki) - DokuWiki is a simple to use and highly versatile Open Source wiki software
 - [Duplicati](https://github.com/linuxserver/docker-duplicati) - Store securely encrypted backups in the cloud!
+- [Emulatorjs](https://github.com/EmulatorJS/EmulatorJS) - Self-hosted Javascript emulation for various system.
 - [Filebrowser](https://github.com/filebrowser/filebrowser) - Web File Browser
 - [Firefly III](https://github.com/firefly-iii/firefly-iii) - A personal finances manager
 - [Fireshare](https://github.com/ShaneIsrael/fireshare) - Self host your media and share with unique links
diff --git a/apps/emulatorjs/config.json b/apps/emulatorjs/config.json
new file mode 100644
index 00000000..0b49d45f
--- /dev/null
+++ b/apps/emulatorjs/config.json
@@ -0,0 +1,16 @@
+{
+  "$schema": "../schema.json",
+  "name": "Emulatorjs",
+  "port": 8164,
+  "available": true,
+  "exposable": true,
+  "id": "emulatorjs",
+  "tipi_version": 1,
+  "version": "1.7.2",
+  "categories": ["gaming"],
+  "description": "Self-hosted Javascript emulation for various system.",
+  "short_desc": "Self-hosted Javascript emulation for various system.",
+  "author": "EmulatorJS",
+  "source": "https://github.com/EmulatorJS/EmulatorJS",
+  "form_fields": []
+}
diff --git a/apps/emulatorjs/docker-compose.yml b/apps/emulatorjs/docker-compose.yml
new file mode 100644
index 00000000..28634532
--- /dev/null
+++ b/apps/emulatorjs/docker-compose.yml
@@ -0,0 +1,24 @@
+version: '3.7'
+
+services:
+  emulatorjs:
+    container_name: emulatorjs
+    image: lscr.io/linuxserver/emulatorjs:1.7.2
+    ports:
+      - ${APP_PORT}:80
+      - 8165:3000
+    volumes:
+      - ${APP_DATA_DIR}/data/emulatorjs-config:/config
+      - ${APP_DATA_DIR}/data/emulatorjs:/data
+    environment:
+      - TZ=${TZ}
+    restart: unless-stopped
+    networks:
+      - tipi_main_network
+    labels:
+      traefik.enable: ${APP_EXPOSED}
+      traefik.http.routers.emulatorjs.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.appname.entrypoints: websecure
+      traefik.http.routers.emulatorjs.service: emulatorjs
+      traefik.http.routers.emulatorjs.tls.certresolver: myresolver
+      traefik.http.services.emulatorjs.loadbalancer.server.port: 80
diff --git a/apps/emulatorjs/metadata/description.md b/apps/emulatorjs/metadata/description.md
new file mode 100644
index 00000000..1512754c
--- /dev/null
+++ b/apps/emulatorjs/metadata/description.md
@@ -0,0 +1,31 @@
+Self-hosted **Javascript** emulation for various system.
+
+The admin panel is accessible on port 8165.
+
+### [](https://github.com/EmulatorJS/EmulatorJS#extensions)Extensions
+
+**[GameLibrary](https://github.com/Ramaerel/emulatorjs-GameLibrary)**
+
+# [](https://github.com/EmulatorJS/EmulatorJS#supported-systems)Supported Systems
+
+### [](https://github.com/EmulatorJS/EmulatorJS#nintendo)Nintendo
+
+**[Game Boy Advance](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/Nintendo%20Game%20Boy%20Advance.md)**   |  **[Famicom / NES](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/NES-Famicom.md)**   |  **[Virtual Boy](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/Virtual%20Boy.md)**
+
+**[Game Boy](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/Nintendo%20Game%20Boy.md)**   |  **[SNES](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/SNES.md)**   |  **[DS](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/Nintendo%20DS.md)**   |  **[64](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/Nintendo%2064.md)**
+
+### [](https://github.com/EmulatorJS/EmulatorJS#sega)Sega
+
+**[Master System](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/Sega%20Master%20System.md)**   |  **[Mega Drive](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/Sega%20Mega%20Drive.md)**   |  **[Game Gear](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/Sega%20Game%20Gear.md)**
+
+**[Saturn](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/Sega%20Saturn.md)**   |  **[32X](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/Sega%2032X.md)**   |  **[CD](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/Sega%20CD.md)**
+
+### [](https://github.com/EmulatorJS/EmulatorJS#atari)Atari
+
+**[2600](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/Atari%202600.md)**   |  **[5200](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/Atari%205200.md)**   |  **[7800](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/Atari%207800.md)**   |  **[Lynx](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/Atari%20Lynx.md)**   |  **[Jaguar](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/Atari%20Jaguar.md)**
+
+### [](https://github.com/EmulatorJS/EmulatorJS#other)Other
+
+**[TurboGrafs 16 PC Engine](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/TurboGrafs%2016-PC%20Engine.md)**   |  **[WanderSwan Color](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/WanderSwan-Color.md)**   |  **[Neo Geo Poket](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/Neo%20Geo%20Poket.md)**
+
+**[PlayStation](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/PlayStation.md)**   |  **[Arcade](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/Arcade.md)**   |  **[MSX](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/MSX.md)**   |  **[3DO](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/3DO.md)**   |  **[MAME 2003](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Systems/MAME%202003.md)**
diff --git a/apps/emulatorjs/metadata/logo.jpg b/apps/emulatorjs/metadata/logo.jpg
new file mode 100644
index 00000000..d5c74529
Binary files /dev/null and b/apps/emulatorjs/metadata/logo.jpg differ