diff --git a/container.yaml b/container.yaml
index 6488c4f..06b8a01 100644
--- a/container.yaml
+++ b/container.yaml
@@ -1,11 +1,17 @@
 flatpak:
-    id: net.thunderbird.Thunderbird
+    id: org.mozilla.Thunderbird
     branch: stable
+    end-of-life: Renamed to net.thunderbird.Thunderbird
+    end-of-life-rebase: net.thunderbird.Thunderbird
+    name: eol/thunderbird
+    component: thunderbird-flatpak
     runtime-name: flatpak-runtime
-    runtime-version: f44
+    runtime-version: f41
     packages:
         - thunderbird
     command: thunderbird
+    rename-appdata-file: net.thunderbird.Thunderbird.appdata.xml
+    rename-desktop-file: net.thunderbird.Thunderbird.desktop
     rename-icon: thunderbird
     finish-args: |-
         --device=dri
@@ -23,12 +29,16 @@ flatpak:
         --filesystem=xdg-run/gnupg:ro
         --filesystem=xdg-run/speech-dispatcher:ro
         --filesystem=/run/.heim_org.h5l.kcm-socket
+        --own-name=net.thunderbird.Thunderbird.*
         --own-name=org.mozilla.thunderbird.*
         --own-name=org.mozilla.thunderbird_default.*
         --talk-name=org.gtk.vfs.*
         --talk-name=org.a11y.Bus
         --talk-name=org.freedesktop.Notifications
         --system-talk-name=org.freedesktop.NetworkManager
+        --env=TMPDIR=~/.var/app/org.mozilla.Thunderbird/cache/tmp
+
     cleanup-commands: |
-        sed -e 's|<icon.*</icon>||' -i /app/share/metainfo/*.appdata.xml
+        sed -e 's@>net\.thunderbird\.Thunderbird<@>org.mozilla.Thunderbird<@' \
+            -e 's|<icon.*</icon>||' -i /app/share/metainfo/*.appdata.xml
         rm /app/share/icons/hicolor/24x24/apps/thunderbird.png