diff --git a/automation_tools/automation_task_list.cfg b/automation_tools/automation_task_list.cfg
index 94013b2d..baaca343 100644
--- a/automation_tools/automation_task_list.cfg
+++ b/automation_tools/automation_task_list.cfg
@@ -24,4 +24,5 @@ hash^RETRODECKMELONDSLATEST^https://github.com/RetroDECK/net.kuribo64.melonDS/re
 hash^RETRODECKSOLARUSLATEST^https://github.com/RetroDECK/org.solarus_games.solarus.Launcher/releases/latest/download/RetroDECK-solarus-Artifact.tar.gz
 hash^RETRODECKGZDOOMLATEST^https://github.com/RetroDECK/org.zdoom.GZDoom/releases/latest/download/RetroDECK-gzdoom-Artifact.tar.gz
 hash^RETRODECKMAMELATEST^https://github.com/RetroDECK/MAME/releases/latest/download/RetroDECK-MAME-Artifact.tar.gz
-hash^PORTMASTERLATESTSHA^https://github.com/PortsMaster/PortMaster-GUI/releases/latest/download/retrodeck.portmaster.zip
\ No newline at end of file
+hash^XENIACANARYLATESTSHA^https://github.com/xenia-canary/xenia-canary/releases/download/experimental/xenia_canary.zip
+hash^PORTMASTERLATESTSHA^https://github.com/PortsMaster/PortMaster-GUI/releases/latest/download/retrodeck.portmaster.zip
diff --git a/config/retrodeck/reference_lists/features.json b/config/retrodeck/reference_lists/features.json
index 6da76574..1f6a1d10 100644
--- a/config/retrodeck/reference_lists/features.json
+++ b/config/retrodeck/reference_lists/features.json
@@ -776,6 +776,9 @@
     "x68000": {
       "name": "Sharp X68000"
     },
+    "xbox360": {
+      "name": "Microsoft Xbox 360"
+    },
     "xbox": {
       "name": "Microsoft Xbox"
     },
@@ -1133,6 +1136,12 @@
       "name": "PortMaster",
       "system": "portmaster",
       "launch": "PortMaster"
+    },
+    "xenia": {
+      "description": "Xenia Canary Xbox360 Emulator",
+      "name": "Xenia Canary",
+      "system": "xbox360",
+      "launch": "xenia-canary"
     }
   }
 }
diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh
index 03765a58..e2198463 100644
--- a/functions/prepare_component.sh
+++ b/functions/prepare_component.sh
@@ -890,6 +890,17 @@ prepare_component() {
     
   fi
 
+  if [[ "$component" =~ ^(xenia|all)$ ]]; then
+  component_found="true"
+    log i "----------------------"
+    log i "Prepearing Xenia"
+    log i "----------------------"
+
+    rm -rf "/var/data/xenia-canary-pfx"
+    # TODO: fill this
+    
+  fi
+
   if [[ $component_found == "false" ]]; then
     log e "Supplied component $component not found, not resetting"
   fi
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 4bef5bd5..83ab92cd 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -4,6 +4,19 @@ runtime-version: "6.7"
 sdk: org.kde.Sdk
 command: retrodeck.sh
 
+base: org.winehq.Wine
+base-version: stable-23.08
+
+inherit-extensions:
+  - org.freedesktop.Platform.Compat.i386
+  - org.freedesktop.Platform.ffmpeg_full.i386
+  - org.freedesktop.Platform.ffmpeg-full
+  - org.freedesktop.Platform.GL32
+  - org.freedesktop.Platform.VAAPI.Intel.i386
+  - org.winehq.Wine.DLLs
+  - org.winehq.Wine.gecko
+  - org.winehq.Wine.mono
+
 finish-args:
   - --socket=wayland
   - --socket=x11
@@ -580,10 +593,11 @@ modules:
       - cp -r files/* "${FLATPAK_DEST}"
       - chmod +x "${FLATPAK_DEST}/bin/"*
     sources:
-      # Testing the new feat/update-3.1.0
       - type: archive
-        url: https://github.com/RetroDECK/ES-DE/releases/latest/download/RetroDECK-ES-DE-Artifact.tar.gz
-        sha256: RETRODECKESDELATEST
+        url: https://github.com/RetroDECK/ES-DE/releases/download/feat%2Fxenia-190924.46/RetroDECK-ES-DE-Artifact.tar.gz
+        sha256: 6ea55f59613a066ae36f04b61b3e9810d45fa2ca0924d876b5ada2ca28f5f36f
+        # url: https://github.com/RetroDECK/ES-DE/releases/latest/download/RetroDECK-ES-DE-Artifact.tar.gz
+        # sha256: RETRODECKESDELATEST
 
   - name: retrodeck-theme
     buildsystem: simple
@@ -609,6 +623,23 @@ modules:
         url: https://github.com/ruffle-rs/ruffle/releases/download/nightly-2024-08-09/ruffle-nightly-2024_08_09-linux-x86_64.tar.gz
         sha256: d2c4c77d8426da6df8dc8b2a57565c151146464a8eec605d5faa68a297d8cad6
 
+  # XENIA CANARY
+  - name: xenia-canary
+    buildsystem: simple
+    build-commands:
+      - install -Dm755 xenia_canary.exe "${FLATPAK_DEST}/xenia-canary/xenia_canary.exe"
+      - install -Dm755 xenia-canary "${FLATPAK_DEST}/bin/xenia-canary"
+    sources:
+      - type: archive
+        url: https://github.com/xenia-canary/xenia-canary/releases/download/experimental/xenia_canary.zip
+        sha256: XENIACANARYLATESTSHA
+      - type: script
+        commands:
+          - |
+            #!/bin/bash
+            WINEPREFIX="/var/data/xenia-canary-pfx" wine "/app/xenia-canary/xenia_canary.exe"
+        dest-filename: xenia-canary
+
   - name: fetch-missing-libs
     buildsystem: simple
     build-commands: