diff --git a/celestia-qt.yaml b/celestia-qt.yaml
index c5e360a..25ed316 100644
--- a/celestia-qt.yaml
+++ b/celestia-qt.yaml
@@ -44,6 +44,10 @@ data:
         rationale: Runtime dependency
         ref: f38
         arches: [aarch64, x86_64]
+      google-noto-fonts:
+        rationale: Runtime dependency
+        ref: f38
+        arches: [aarch64, x86_64]
       libavif:
         rationale: Runtime dependency
         ref: f38
diff --git a/container.yaml b/container.yaml
index 6993973..a5ef00e 100644
--- a/container.yaml
+++ b/container.yaml
@@ -1,11 +1,14 @@
 compose:
     modules:
-    - celestia-qt:stable
+    - celestia-qt:f38
 flatpak:
     id: space.celestia.celestia_qt
+    name: eol/celestia-qt
+    end-of-life-rebase: space.celestia.celestia_qt6
     branch: stable
-    command: celestia-qt
-    rename-desktop-file: celestia-qt.desktop
+    command: celestia-qt6
+    rename-appdata-file: space.celestia.celestia_qt6.metainfo.xml
+    rename-desktop-file: celestia-qt6.desktop
     rename-icon: celestia
     # writes ~/.celestiarc, can save pictures and videos
     finish-args: |-