diff --git a/docs/AppList.md b/docs/AppList.md
index 859376f..ae656df 100644
--- a/docs/AppList.md
+++ b/docs/AppList.md
@@ -4,7 +4,7 @@ List of all apps included in this project with info related to it.
 
 |**Arm32:**          |**Arm64:**|**Amd64:**|**Total:**|
 |:-------------------|:--------:|:--------:|:--------:|
-| 106 apps | 223 apps | 224 apps | 227 apps |
+| 106 apps | 224 apps | 225 apps | 228 apps |
 
 ---
 
@@ -57,6 +57,7 @@ List of all apps included in this project with info related to it.
 |[Eclipse Mosquitto MQTT](https://mosquitto.org/)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|Container| [![](../build/images/blue_doc_icon.png)](https://mosquitto.org/) |  | [![](../build/images/script_icon.png)](../tools/install_mosquitto.sh) |  |
 |[Emby](https://emby.media/)|:x:|:heavy_check_mark:|:heavy_check_mark:|Container| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-emby) |  |  |  |
 |[EmbyStat](https://github.com/mregni/EmbyStat)|:x:|:heavy_check_mark:|:heavy_check_mark:|Container| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-embystat) |  |  |  |
+|[EmulatorJS](https://hub.docker.com/r/linuxserver/emulatorjs)|:x:|:heavy_check_mark:|:heavy_check_mark:|Container| [![](../build/images/blue_doc_icon.png)](https://github.com/EmulatorJS/EmulatorJS) |  |  |  |
 |[FileBrowser latest](https://filebrowser.org/)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|Container| [![](../build/images/blue_doc_icon.png)](https://filebrowser.org/installation#docker) |  |  | [![Installing JDownloader and File Browser On The Pi Docker Server](../build/images/yt-badge-novaspirit.png "Installing JDownloader and File Browser On The Pi Docker Server")](https://www.youtube.com/watch?v=30MYRgCObu8&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=4) |
 |[FileBrowser S6](https://filebrowser.org/)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|Container| [![](../build/images/blue_doc_icon.png)](https://filebrowser.org/installation#docker) |  |  | [![Installing JDownloader and File Browser On The Pi Docker Server](../build/images/yt-badge-novaspirit.png "Installing JDownloader and File Browser On The Pi Docker Server")](https://www.youtube.com/watch?v=30MYRgCObu8&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=4) |
 |[Filezilla](https://hub.docker.com/r/linuxserver/filezilla)|:x:|:heavy_check_mark:|:heavy_check_mark:|Container| [![](../build/images/blue_doc_icon.png)](https://hub.docker.com/r/linuxserver/filezilla) |  |  |  |
diff --git a/template/portainer-v2-amd64.json b/template/portainer-v2-amd64.json
index cb396a4..e428624 100644
--- a/template/portainer-v2-amd64.json
+++ b/template/portainer-v2-amd64.json
@@ -1976,6 +1976,47 @@
 				}
 			]
 		},
+		{
+			"categories": [
+				"Games"
+			],
+			"description": "In browser web based emulation portable to nearly any device for many retro consoles. A mix of emulators is used between Libretro and EmulatorJS.",
+			"env": [
+				{
+					"default": "1000",
+					"label": "PUID",
+					"name": "PUID"
+				},
+				{
+					"default": "1000",
+					"label": "PGID",
+					"name": "PGID"
+				}
+			],
+			"image": "lscr.io/linuxserver/emulatorjs:latest",
+			"logo": "https://raw.githubusercontent.com/EmulatorJS/EmulatorJS/main/docs/Logo-light.png",
+			"name": "EmulatorJS",
+			"platform": "linux",
+			"ports": [
+				"3003:3000/tcp",
+				"3008:80/tcp",
+				"4001:4001/tcp"
+			],
+			"restart_policy": "unless-stopped",
+			"title": "EmulatorJS",
+			"type": 1,
+			"volumes": [
+				{
+					"bind": "/portainer/Files/AppData/Config/emulatorjs",
+					"container": "/config"
+				},
+				{
+					"bind": "/portainer/Downloads/Roms",
+					"container": "/data"
+				}
+			],
+			"note": "<b>Template created by Pi-Hosted Series</b><br><b>Check our Github page: <a href=\"https://github.com/pi-hosted/pi-hosted\" target=\"_blank\">https://github.com/pi-hosted/pi-hosted</a></b><br><br><b>Official Webpage: </b><a href=\"https://hub.docker.com/r/linuxserver/emulatorjs\" target=\"_blank\">https://hub.docker.com/r/linuxserver/emulatorjs</a><br><b>Official Docker Documentation: </b><a href=\"https://github.com/EmulatorJS/EmulatorJS\" target=\"_blank\">https://github.com/EmulatorJS/EmulatorJS</a><br><br><br>"
+		},
 		{
 			"categories": [
 				"Other",
diff --git a/template/portainer-v2-arm64.json b/template/portainer-v2-arm64.json
index f51518d..3afb2a7 100644
--- a/template/portainer-v2-arm64.json
+++ b/template/portainer-v2-arm64.json
@@ -1934,6 +1934,47 @@
 				}
 			]
 		},
+		{
+			"categories": [
+				"Games"
+			],
+			"description": "In browser web based emulation portable to nearly any device for many retro consoles. A mix of emulators is used between Libretro and EmulatorJS.",
+			"env": [
+				{
+					"default": "1000",
+					"label": "PUID",
+					"name": "PUID"
+				},
+				{
+					"default": "1000",
+					"label": "PGID",
+					"name": "PGID"
+				}
+			],
+			"image": "lscr.io/linuxserver/emulatorjs:latest",
+			"logo": "https://raw.githubusercontent.com/EmulatorJS/EmulatorJS/main/docs/Logo-light.png",
+			"name": "EmulatorJS",
+			"platform": "linux",
+			"ports": [
+				"3003:3000/tcp",
+				"3008:80/tcp",
+				"4001:4001/tcp"
+			],
+			"restart_policy": "unless-stopped",
+			"title": "EmulatorJS",
+			"type": 1,
+			"volumes": [
+				{
+					"bind": "/portainer/Files/AppData/Config/emulatorjs",
+					"container": "/config"
+				},
+				{
+					"bind": "/portainer/Downloads/Roms",
+					"container": "/data"
+				}
+			],
+			"note": "<b>Template created by Pi-Hosted Series</b><br><b>Check our Github page: <a href=\"https://github.com/pi-hosted/pi-hosted\" target=\"_blank\">https://github.com/pi-hosted/pi-hosted</a></b><br><br><b>Official Webpage: </b><a href=\"https://hub.docker.com/r/linuxserver/emulatorjs\" target=\"_blank\">https://hub.docker.com/r/linuxserver/emulatorjs</a><br><b>Official Docker Documentation: </b><a href=\"https://github.com/EmulatorJS/EmulatorJS\" target=\"_blank\">https://github.com/EmulatorJS/EmulatorJS</a><br><br><br>"
+		},
 		{
 			"categories": [
 				"Other",