diff --git a/container.yaml b/container.yaml
index 3e76c8c..248f8a7 100644
--- a/container.yaml
+++ b/container.yaml
@@ -1,18 +1,27 @@
 flatpak:
-    id: br.app.pw3270
+    id: br.app.pw3270.terminal
     branch: stable
+    end-of-life: Renamed to br.app.pw3270
+    end-of-life-rebase: br.app.pw3270
+    name: eol/pw3270
+    component: pw3270-flatpak
     command: pw3270
-    rename-mime-file: pw3270.xml
+    rename-appdata-file: pw3270.metainfo.xml
+    rename-desktop-file: pw3270.desktop
+    rename-icon: pw3270
     finish-args: |-
         --share=network
         --share=ipc
         --socket=fallback-x11
         --socket=wayland
+        --own-name=br.com.bb.pw3270
     cleanup-commands: |
-        sed -i -e '/<id>/s/\.desktop//' /app/share/metainfo/*.xml
-        sed -i -e '/generic-icon/s/"pw3270"/"br.app.pw3270"/' /app/share/mime/packages/*.xml
+        sed -i -e 's/br.com.bb.pw3270/br.app.pw3270.terminal/' /app/share/metainfo/pw3270.metainfo.xml
+        install -D -m0644 -t /app/share/icons/hicolor/scalable/apps/ /app/share/pw3270/icons/pw3270.svg
+        sed -i -e '/generic-icon/s/pw3270/br.app.pw3270.terminal/' /app/share/mime/packages/pw3270.xml
+        mv /app/share/mime/packages/{pw3270,br.app.pw3270.terminal}.xml
     runtime-name: flatpak-runtime
-    runtime-version: f44
+    runtime-version: f41
     packages:
         - pw3270
         - rbanffy-3270-fonts