diff --git a/flatpak/org.gajim.Gajim.Plugin.omemo.metainfo.xml b/flatpak/org.gajim.Gajim.Plugin.omemo.metainfo.xml
index 476bb46..dcbc494 100644
--- a/flatpak/org.gajim.Gajim.Plugin.omemo.metainfo.xml
+++ b/flatpak/org.gajim.Gajim.Plugin.omemo.metainfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="addon">
   <id>org.gajim.Gajim.Plugin.omemo</id>
-  <extends>org.gajim.Gajim.desktop</extends>
+  <extends>org.gajim.Gajim</extends>
   <name>OMEMO Plugin</name>
   <summary>XMPP Extension Protocol (XEP) for secure multi-client end-to-end encryption</summary>
   <url type="homepage">https://gajim.org/</url>
diff --git a/flatpak/org.gajim.Gajim.Plugin.omemo.yaml b/flatpak/org.gajim.Gajim.Plugin.omemo.yaml
index 7e9f224..0ff5e56 100644
--- a/flatpak/org.gajim.Gajim.Plugin.omemo.yaml
+++ b/flatpak/org.gajim.Gajim.Plugin.omemo.yaml
@@ -65,4 +65,4 @@ modules:
         sha256: c41e9341a6a807a889e794c37e384ea598cd6341e5b96ad4be8f5b741a753452
       - type: file
         path: org.gajim.Gajim.Plugin.omemo.metainfo.xml
-        sha256: d7ef976ee4239d5c6b0da7b5e3bcc85d99db7d860c0329347a9522e8a176c69e
+        sha256: 795eabeddcee3338a627f84068ee07e8221cca4ae91c08030ffb57fdcccf750b
diff --git a/flatpak/org.gajim.Gajim.Plugin.openpgp.metainfo.xml b/flatpak/org.gajim.Gajim.Plugin.openpgp.metainfo.xml
index bc2bd17..82902fc 100644
--- a/flatpak/org.gajim.Gajim.Plugin.openpgp.metainfo.xml
+++ b/flatpak/org.gajim.Gajim.Plugin.openpgp.metainfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="addon">
   <id>org.gajim.Gajim.Plugin.openpgp</id>
-  <extends>org.gajim.Gajim.desktop</extends>
+  <extends>org.gajim.Gajim</extends>
   <name>OpenPGP Plugin</name>
   <summary>Experimental OpenPGP XEP-0373 Implementation</summary>
   <url type="homepage">https://gajim.org/</url>
diff --git a/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml b/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml
index cd8b429..80f4d2d 100644
--- a/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml
+++ b/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml
@@ -24,4 +24,4 @@ modules:
         sha256: edaa200d996a87f4632c99dd02c7ffacf01fad1b70381f6896b9a9c45bdda01e
       - type: file
         path: org.gajim.Gajim.Plugin.openpgp.metainfo.xml
-        sha256: bfe2a4b508b7682dba37d3187f7b111cb07163dad141c52dbb4b6d264ac66c8a
+        sha256: 4769307f972aca3320311c1b0e514a7e41f1d1f437887147eb84ff1ec3245203
diff --git a/flatpak/org.gajim.Gajim.Plugin.pgp.metainfo.xml b/flatpak/org.gajim.Gajim.Plugin.pgp.metainfo.xml
index f4da243..1fdf5ed 100644
--- a/flatpak/org.gajim.Gajim.Plugin.pgp.metainfo.xml
+++ b/flatpak/org.gajim.Gajim.Plugin.pgp.metainfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="addon">
   <id>org.gajim.Gajim.Plugin.pgp</id>
-  <extends>org.gajim.Gajim.desktop</extends>
+  <extends>org.gajim.Gajim</extends>
   <name>PGP Plugin</name>
   <summary>XMPP Extension Protocol (XEP) for secure multi-client end-to-end encryption</summary>
   <url type="homepage">https://gajim.org/</url>
diff --git a/flatpak/org.gajim.Gajim.Plugin.pgp.yaml b/flatpak/org.gajim.Gajim.Plugin.pgp.yaml
index ce48244..661efe7 100644
--- a/flatpak/org.gajim.Gajim.Plugin.pgp.yaml
+++ b/flatpak/org.gajim.Gajim.Plugin.pgp.yaml
@@ -25,4 +25,4 @@ modules:
         sha256: 5d4687e2ba79904c4a0587a5c51833ae66cece43376577cddbd9534418ea5704
       - type: file
         path: org.gajim.Gajim.Plugin.pgp.metainfo.xml
-        sha256: cda6e41cdff3f7ff98136721a522305046714343236f9eb54b3e4cba5ccb34ad
+        sha256: fa574af0b79ae62599d6d7c9c4016742de3b1b4b10890f66b096b7581dfe593d
diff --git a/flatpak/org.gajim.Gajim.Plugin.syntax_highlight.metainfo.xml b/flatpak/org.gajim.Gajim.Plugin.syntax_highlight.metainfo.xml
index 649cc0b..8f20fcc 100644
--- a/flatpak/org.gajim.Gajim.Plugin.syntax_highlight.metainfo.xml
+++ b/flatpak/org.gajim.Gajim.Plugin.syntax_highlight.metainfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="addon">
   <id>org.gajim.Gajim.Plugin.syntax_highlight</id>
-  <extends>org.gajim.Gajim.desktop</extends>
+  <extends>org.gajim.Gajim</extends>
   <name>Source Code Syntax Highlight Plugin</name>
   <summary>Source code syntax highlighting in the chat window</summary>
   <url type="homepage">https://gajim.org/</url>
diff --git a/flatpak/org.gajim.Gajim.Plugin.syntax_highlight.yaml b/flatpak/org.gajim.Gajim.Plugin.syntax_highlight.yaml
index 1ee590a..d315762 100644
--- a/flatpak/org.gajim.Gajim.Plugin.syntax_highlight.yaml
+++ b/flatpak/org.gajim.Gajim.Plugin.syntax_highlight.yaml
@@ -33,4 +33,4 @@ modules:
         sha256: cae16ea749ac3a12341591078c1eb4b6fc6e7dc8123c0964a77adba8285d68dc
       - type: file
         path: org.gajim.Gajim.Plugin.syntax_highlight.metainfo.xml
-        sha256: 8428357b9e51c0eba5d5749a134f4390d4933909f8afe5afaf5bbc958e96d552
+        sha256: 46bff3ab0a5d97a252652b5d2224e973f4f9e5bdffb9a7a9196b07fca0255957
diff --git a/flatpak/org.gajim.Gajim.Plugin.url_image_preview.metainfo.xml b/flatpak/org.gajim.Gajim.Plugin.url_image_preview.metainfo.xml
index 8354ca1..c9e0d52 100644
--- a/flatpak/org.gajim.Gajim.Plugin.url_image_preview.metainfo.xml
+++ b/flatpak/org.gajim.Gajim.Plugin.url_image_preview.metainfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="addon">
   <id>org.gajim.Gajim.Plugin.url_image_preview</id>
-  <extends>org.gajim.Gajim.desktop</extends>
+  <extends>org.gajim.Gajim</extends>
   <name>URL Image Preview Plugin</name>
   <summary>Display a preview of links to images</summary>
   <url type="homepage">https://gajim.org/</url>
diff --git a/flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml b/flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml
index b45cdc8..498f9ec 100644
--- a/flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml
+++ b/flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml
@@ -25,4 +25,4 @@ modules:
         sha256: cc6bb502630ff402b7e75b9f29b87a8f9e8d09382aa411ad001374e4521875e2
       - type: file
         path: org.gajim.Gajim.Plugin.url_image_preview.metainfo.xml
-        sha256: 3b11c6bcb9c349bb6b831031da6740f5da6fc1e925ab98c5c06a62d787ca26fc
+        sha256: 4e4966951ae64ef6c6ae159cc2f46195e6f8d42677d7b059f06816c661400f43