diff --git a/container.yaml b/container.yaml
index a4e5db3..6bf90ac 100644
--- a/container.yaml
+++ b/container.yaml
@@ -1,20 +1,23 @@
 flatpak:
-    id: de.hohnstaedt.xca
+    id: io.github.chris2511.xca
     branch: stable
-    runtime-name: flatpak-kde6-runtime
-    runtime-version: f44
-    packages:
-        - xca
+    end-of-life: Renamed to de.hohnstaedt.xca
+    end-of-life-rebase: de.hohnstaedt.xca
+    component: xca-flatpak
+    name: eol/xca
     command: xca
-    rename-icon: de.hohnstaedt.xca
-    rename-mime-file: xca.xml
-    rename-mime-icons:
-       - x-xca-database
-       - x-xca-template
+    rename-desktop-file: xca.desktop
+    rename-icon: xca
     finish-args: |-
         --device=dri
         --filesystem=xdg-documents
-        --filesystem=xdg-config/kdeglobals:ro
         --share=ipc
         --socket=fallback-x11
         --socket=wayland
+    cleanup-commands: |
+        sed -i -e '/icon name/s/x-xca-[[:alpha:]]*/io.github.chris2511.xca/' /app/share/mime/packages/xca.xml
+        mv /app/share/mime/packages/xca.xml /app/share/mime/packages/io.github.chris2511.xca.xml
+    runtime-name: flatpak-kde5-runtime
+    runtime-version: f39
+    packages:
+        - xca