diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml
index 64b46ab..f6e35e4 100644
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@@ -29,7 +29,7 @@ jobs:
           echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
           echo "> External trigger running off of master branch. To disable this trigger, add \`mame_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
           printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
-          EXT_RELEASE=$(curl -s -L https://ppa.launchpadcontent.net/c.falco/mame/ubuntu/dists/noble/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: mame' | awk -F ': ' '/Version/{print $2;exit}' | awk -F'ubuntu' '{print $1}' | sed 's/+//g')
+          EXT_RELEASE=$(curl -s -L https://ppa.launchpadcontent.net/c.falco/mame/ubuntu/dists/resolute/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: mame' | awk -F ': ' '/Version/{print $2;exit}' | awk -F'ubuntu' '{print $1}' | sed 's/+//g')
           echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
           if grep -q "^mame_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
             echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
diff --git a/Dockerfile b/Dockerfile
index 2835643..f14c40a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-selkies:ubuntunoble
+FROM ghcr.io/linuxserver/baseimage-selkies:ubunturesolute
 
 # set version label
 ARG BUILD_DATE
@@ -20,12 +20,7 @@ RUN \
     /usr/share/selkies/www/icon.png \
     https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/mame-logo.png && \
   echo "**** install packages ****" && \
-  apt-key adv \
-    --keyserver hkp://keyserver.ubuntu.com:80 \
-    --recv-keys BD90C31EDB703FB5C74D68DBE309D18C36773207 && \
-  echo \
-    "deb https://ppa.launchpadcontent.net/c.falco/mame/ubuntu  noble main" > \
-    /etc/apt/sources.list.d/mame.list && \
+  add-apt-repository -y ppa:c.falco/mame && \
   apt-get update && \
   DEBIAN_FRONTEND=noninteractive \
   apt-get install --no-install-recommends -y \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 9738c07..73c6294 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-ubuntunoble
+FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-ubunturesolute
 
 # set version label
 ARG BUILD_DATE
@@ -20,12 +20,7 @@ RUN \
     /usr/share/selkies/www/icon.png \
     https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/mame-logo.png && \
   echo "**** install packages ****" && \
-  apt-key adv \
-    --keyserver hkp://keyserver.ubuntu.com:80 \
-    --recv-keys BD90C31EDB703FB5C74D68DBE309D18C36773207 && \
-  echo \
-    "deb https://ppa.launchpadcontent.net/c.falco/mame/ubuntu  noble main" > \
-    /etc/apt/sources.list.d/mame.list && \
+  add-apt-repository -y ppa:c.falco/mame && \
   apt-get update && \
   DEBIAN_FRONTEND=noninteractive \
   apt-get install --no-install-recommends -y \
diff --git a/Jenkinsfile b/Jenkinsfile
index 2b6fac5..308d325 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,6 +33,7 @@ pipeline {
     CI_PORT = '3001'
     CI_SSL = 'true'
     CI_DELAY = '120'
+    CI_WEB_SCREENSHOT_DELAY = '30'
     CI_DOCKERENV = 'TZ=US/Pacific'
     CI_AUTH = 'user:password'
     CI_WEBPATH = ''
@@ -148,7 +149,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' curl -s -L https://ppa.launchpadcontent.net/c.falco/mame/ubuntu/dists/noble/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: mame' | awk -F ': ' '/Version/{print $2;exit}' | awk -F'ubuntu' '{print $1}' | sed 's/+//g' ''',
+            script: ''' curl -s -L https://ppa.launchpadcontent.net/c.falco/mame/ubuntu/dists/resolute/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: mame' | awk -F ': ' '/Version/{print $2;exit}' | awk -F'ubuntu' '{print $1}' | sed 's/+//g' ''',
             returnStdout: true).trim()
             env.RELEASE_LINK = 'custom_command'
         }
@@ -893,6 +894,7 @@ pipeline {
                 --shm-size=1gb \
                 -v /var/run/docker.sock:/var/run/docker.sock \
                 -e IMAGE=\"${IMAGE}\" \
+                -e WEB_SCREENSHOT_DELAY=\"${CI_WEB_SCREENSHOT_DELAY}\" \
                 -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
                 -e TAGS=\"${CI_TAGS}\" \
                 -e META_TAG=\"${META_TAG}\" \
diff --git a/README.md b/README.md
index f625254..cc78366 100644
--- a/README.md
+++ b/README.md
@@ -642,6 +642,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **04.05.26:** - Rebase to resolute.
 * **05.03.26:** - Make Wayland default disable with PIXELFLUX_WAYLAND=false.
 * **20.12.25:** - Add Wayland init logic.
 * **03.07.25:** - Initial release.
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 8aef6b4..79d76de 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -3,7 +3,7 @@
 # jenkins variables
 project_name: docker-mame
 external_type: na
-custom_version_command: "curl -s -L https://ppa.launchpadcontent.net/c.falco/mame/ubuntu/dists/noble/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: mame' | awk -F ': ' '/Version/{print $2;exit}' | awk -F'ubuntu' '{print $1}' | sed 's/+//g'"
+custom_version_command: "curl -s -L https://ppa.launchpadcontent.net/c.falco/mame/ubuntu/dists/resolute/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: mame' | awk -F ': ' '/Version/{print $2;exit}' | awk -F'ubuntu' '{print $1}' | sed 's/+//g'"
 release_type: stable
 release_tag: latest
 ls_branch: master
@@ -23,6 +23,7 @@ repo_vars:
   - CI_PORT = '3001'
   - CI_SSL = 'true'
   - CI_DELAY = '120'
+  - CI_WEB_SCREENSHOT_DELAY = '30'
   - CI_DOCKERENV = 'TZ=US/Pacific'
   - CI_AUTH = 'user:password'
   - CI_WEBPATH = ''
diff --git a/readme-vars.yml b/readme-vars.yml
index d4dd715..4a84672 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -108,6 +108,7 @@ init_diagram: |
   "mame:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "04.05.26:", desc: "Rebase to resolute."}
   - {date: "05.03.26:", desc: "Make Wayland default disable with PIXELFLUX_WAYLAND=false."}
   - {date: "20.12.25:", desc: "Add Wayland init logic."}
   - {date: "03.07.25:", desc: "Initial release."}