diff --git a/container.yaml b/container.yaml
index ccb879a..eb57ca4 100644
--- a/container.yaml
+++ b/container.yaml
@@ -2,13 +2,20 @@ platforms:
     only:
     - x86_64
 flatpak:
-    id: org.torproject.torbrowser-launcher
+    id: com.github.micahflee.torbrowser-launcher
     branch: stable
-    runtime-name: flatpak-kde6-runtime
-    runtime-version: f44
+    end-of-life: Renamed to org.torproject.torbrowser-launcher
+    end-of-life-rebase: org.torproject.torbrowser-launcher
+    name: eol/torbrowser-launcher
+    component: torbrowser-launcher-flatpak
+    runtime-name: flatpak-kde5-runtime
+    runtime-version: f42
     packages:
     - torbrowser-launcher
     command: torbrowser-launcher
+    rename-appdata-file: torbrowser.appdata.xml
+    rename-desktop-file: torbrowser.desktop
+    rename-icon: torbrowser
     finish-args: |-
         --device=dri
         --filesystem=xdg-download
@@ -23,3 +30,7 @@ flatpak:
         --talk-name=org.kde.KGlobalSettings
         --env=MOZ_ENABLE_WAYLAND=1
         --env=TBL_SHARE=/app/share
+    cleanup-commands: |
+        sed -i -e 's|Icon=torbrowser|Icon=com.github.micahflee.torbrowser-launcher|' \
+            /app/share/applications/torbrowser-settings.desktop
+        mv /app/share/applications/{torbrowser,com.github.micahflee.torbrowser-launcher}-settings.desktop