diff --git a/comps.xml b/comps.xml
index 439d551..1a1f435 100644
--- a/comps.xml
+++ b/comps.xml
@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
 <comps>
+  <group>
+    <!-- We don't include this in environment groups, to not install flatpaks that conflict with already installed RPMs during the 40 to 41 upgrade -->
+    <id>default-flatpak-support</id>
+    <name>Default Flatpak support</name>
+    <description>Default Flatpak support for Ultramarine products</description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">polycrystal</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>multimedia</id>
     <name>Multimedia</name>
@@ -58,7 +69,6 @@
       <packagereq type="default">sipa-fonts</packagereq>
       <packagereq type="default">ibus-mozc</packagereq>
       <packagereq type="default">mozc</packagereq>
-      <packagereq type="default">polycrystal</packagereq>
     </packagelist>
   </group>
   <group>