diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bc55a64ca..fecc0b66d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,10 +44,13 @@ jobs:
           images: |
             name=rommapp/romm
             name=ghcr.io/rommapp/romm
+          flavor: |
+            latest=auto
+            suffix=-slim,onlatest=true
           tags: |
-            type=semver,pattern={{version}}-slim
-            type=semver,pattern={{major}}.{{minor}}-slim
-            type=semver,pattern={{major}}-slim
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
           labels: |
             org.opencontainers.image.version={{version}}-slim
             org.opencontainers.image.title="rommapp/romm"
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3537c3587..3a4db2050 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -141,6 +141,8 @@ COPY ./frontend/assets/default ${WEBSERVER_FOLDER}/assets/default
 COPY ./frontend/assets/platforms ${WEBSERVER_FOLDER}/assets/platforms
 COPY ./frontend/assets/scrappers ${WEBSERVER_FOLDER}/assets/scrappers
 COPY ./frontend/assets/webrcade/feed ${WEBSERVER_FOLDER}/assets/webrcade/feed
+COPY ./frontend/assets/emulatorjs ${WEBSERVER_FOLDER}/assets/emulatorjs
+COPY ./frontend/assets/ruffle ${WEBSERVER_FOLDER}/assets/ruffle
 RUN mkdir -p ${WEBSERVER_FOLDER}/assets/romm && \
     ln -s /romm/resources ${WEBSERVER_FOLDER}/assets/romm/resources && \
     ln -s /romm/assets ${WEBSERVER_FOLDER}/assets/romm/assets
diff --git a/frontend/src/views/Player/EmulatorJS/Base.vue b/frontend/src/views/Player/EmulatorJS/Base.vue
index a28327b82..ea70e012e 100644
--- a/frontend/src/views/Player/EmulatorJS/Base.vue
+++ b/frontend/src/views/Player/EmulatorJS/Base.vue
@@ -44,10 +44,10 @@ function onPlay() {
   }
 
   window.EJS_fullscreenOnLoaded = fullScreenOnPlay.value;
-  window.EJS_pathtodata = "/assets/emulatorjs/";
+  window.EJS_pathtodata = "/assets/emulatorjs/data/";
 
   const script = document.createElement("script");
-  script.src = "/assets/emulatorjs/loader.js";
+  script.src = "/assets/emulatorjs/data/loader.js";
 
   script.onerror = () => {
     window.EJS_pathtodata = `https://cdn.emulatorjs.org/${EMULATORJS_VERSION}/data`;