diff --git a/README.md b/README.md
index eb654bac..fb121957 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..518fb4a5
--- /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": ["development"],
+  "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..722ace27
--- /dev/null
+++ b/apps/emulatorjs/docker-compose.yml
@@ -0,0 +1,26 @@
+version: "3"
+
+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 #Path to store user profiles
+      - ${APP_DATA_DIR}/data/emulatorjs:/data #Path to store roms/artwork
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - 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..5fa10340
--- /dev/null
+++ b/apps/emulatorjs/metadata/description.md
@@ -0,0 +1,54 @@
+Self-hosted **Javascript** emulation for various system.
+
+[![Button Website](https://camo.githubusercontent.com/e45f7d0268e64ba9b3483737cf98b859bd97d865d213f46cc4588362fef7d31d/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f576562736974652d3733366539623f7374796c653d666f722d7468652d6261646765)](https://emulatorjs.org/)  [![Button Usage](https://camo.githubusercontent.com/4b6eb3771482e3e3310a902ca3e34b76fdf178434ae38727423f3378efa6606b/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f55736167652d3234373862353f7374796c653d666f722d7468652d6261646765)](https://emulatorjs.org/docs/)  
+[![Button Configurator](https://camo.githubusercontent.com/ee38cc466ac8e4fb5e775eab3825014c20284c54c9803d904067916a6c64527a/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f436f6e666967757261746f722d3939326362333f7374796c653d666f722d7468652d6261646765)](https://emulatorjs.org/editor.html)  
+[![Button Demo](https://camo.githubusercontent.com/3c0a46100bc5260f486aa54aa912661f07d0dff009c1ad8cb110b1c993897647/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f44656d6f2d3532383131363f7374796c653d666f722d7468652d6261646765)](https://demo.emulatorjs.org/)  [![Button Legacy](https://camo.githubusercontent.com/8c52b1e8324d824e0bb07ecaf54e5134047610593851f73facd6223345c77ffd/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f4c65676163792d6162393130623f7374796c653d666f722d7468652d6261646765)](https://coldcast.org/games/1/Super-Mario-Bros)
+
+[![Button Contributors](https://camo.githubusercontent.com/c6dc82f464c167e2b99b4b8221aa2b0f741e1719143b0e1cf79c3fa526ca4740/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f436f6e7472696275746f72732d3534623764643f7374796c653d666f722d7468652d6261646765)](https://github.com/EmulatorJS/EmulatorJS/blob/main/docs/Contributors.md)
+
+### [](https://github.com/EmulatorJS/EmulatorJS#extensions)Extensions
+
+ **[GameLibrary](https://github.com/Ramaerel/emulatorjs-GameLibrary)**
+
+   _A library overview for your **ROM** folder._
+
+**\>> When reporting bugs, please specify that you are using the old version**
+
+  
+  
+  
+
+# [](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)**
\ No newline at end of file
diff --git a/apps/emulatorjs/metadata/logo.jpg b/apps/emulatorjs/metadata/logo.jpg
new file mode 100644
index 00000000..7060b9b6
Binary files /dev/null and b/apps/emulatorjs/metadata/logo.jpg differ