diff --git a/container.yaml b/container.yaml
index 4ed585d..6832f47 100644
--- a/container.yaml
+++ b/container.yaml
@@ -5,8 +5,8 @@ flatpak:
     id: org.darktable.Darktable
     branch: stable
     command: darktable
-    rename-appdata-file: darktable.appdata.xml
-    rename-desktop-file: darktable.desktop
+    rename-appdata-file: org.darktable.darktable.appdata.xml
+    rename-desktop-file: org.darktable.darktable.desktop
     rename-icon: darktable
     copy-icon: true
     finish-args: |-
@@ -21,3 +21,7 @@ flatpak:
         --filesystem=xdg-run/gvfs
         --filesystem=xdg-run/gvfsd
         --device=all
+
+    cleanup-commands: |
+        sed -i 's@<id>org\.darktable\.darktable</id>@<id>org.darktable.Darktable</id>@' \
+            /app/share/metainfo/org.darktable.darktable.appdata.xml