diff --git a/comps-f24.xml.in b/comps-f24.xml.in
index 4137a889..573142c0 100644
--- a/comps-f24.xml.in
+++ b/comps-f24.xml.in
@@ -766,6 +766,17 @@
       <packagereq type="default">pulseaudio-module-x11</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>critical-path-hawaii</id>
+    <_name>Critical Path (Hawaii)</_name>
+    <_description>A set of packages that provide the Critical Path functionality for the Hawaii desktop</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">hawaii-shell</packagereq>
+      <packagereq type="mandatory">sddm</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>critical-path-kde</id>
     <_name>Critical Path (KDE)</_name>
@@ -3010,6 +3021,67 @@
       <packagereq type="conditional" requires="emacs">emacs-haskell-mode</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>hawaii-apps</id>
+    <_name>Applications for the Hawaii Desktop</_name>
+    <_description>A set of commonly used applications for the Hawaii Desktop</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>eyesight</packagereq>
+      <packagereq>transmission-qt</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>hawaii-desktop</id>
+    <_name>Hawaii</_name>
+    <_description>Hawaii is a fast, lightweight, intuitive and user friendly Wayland desktop environment that adapts to desktop and mobile devices.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>firewall-config</packagereq>
+      <packagereq>hawaii-icon-theme</packagereq>
+      <packagereq>hawaii-shell</packagereq>
+      <packagereq>hawaii-system-preferences</packagereq>
+      <packagereq>hawaii-widget-styles</packagereq>
+      <packagereq>hawaii-workspace</packagereq>
+      <packagereq>initial-setup-gui</packagereq>
+      <packagereq>mesa-dri-drivers</packagereq>
+      <packagereq>pcmanfm-qt</packagereq>
+      <packagereq>qt5-qdbusviewer</packagereq>
+      <packagereq>qt5-qtbase-gui</packagereq>
+      <packagereq>qt5-qtdeclarative</packagereq>
+      <packagereq>qt5-qtwayland</packagereq>
+      <packagereq>qterminal-qt5</packagereq>
+      <packagereq>qupzilla</packagereq>
+      <packagereq>sddm</packagereq>
+      <packagereq>sddm-theme-hawaii</packagereq>
+      <packagereq>upower</packagereq>
+      <packagereq>xdg-user-dirs</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>hawaii-media</id>
+    <_name>Multimedia support for Hawaii</_name>
+    <_description>Multimedia support for Hawaii</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>pavucontrol</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>hawaii-office</id>
+    <_name>Hawaii Office</_name>
+    <_description>Office suite for Hawaii</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>libreoffice-calc</packagereq>
+      <packagereq>libreoffice-impress</packagereq>
+      <packagereq>libreoffice-writer</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>headless-management</id>
     <_name>Headless Management</_name>
@@ -6686,6 +6758,33 @@
       <packagereq type="default">culmus-yehuda-clm-fonts</packagereq>
     </packagelist>
   </group>
+  <environment>
+    <id>hawaii-desktop-environment</id>
+    <_name>Hawaii Desktop</_name>
+    <_description>Hawaii is a fast, lightweight, intuitive and user friendly Wayland desktop environment that adapts to desktop and mobile devices.</_description>
+    <display_order>21</display_order>
+    <grouplist>
+      <groupid>standard</groupid>
+      <groupid>core</groupid>
+      <groupid>admin-tools</groupid>
+      <groupid>dial-up</groupid>
+      <groupid>fonts</groupid>
+      <groupid>input-methods</groupid>
+      <groupid>multimedia</groupid>
+      <groupid>networkmanager-submodules</groupid>
+      <groupid>hardware-support</groupid>
+      <groupid>printing</groupid>
+      <groupid>guest-desktop-agents</groupid>
+      <groupid>hawaii-desktop</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid>hawaii-apps</groupid>
+      <groupid>hawaii-media</groupid>
+      <groupid>hawaii-office</groupid>
+      <groupid>3d-printing</groupid>
+      <groupid>cloud-management</groupid>
+    </optionlist>
+  </environment>
   <environment>
     <id>minimal-environment</id>
     <_name>Minimal Install</_name>
@@ -7116,6 +7215,7 @@
       <groupid>firefox</groupid>
       <groupid>cinnamon-desktop</groupid>
       <groupid>gnome-desktop</groupid>
+      <groupid>hawaii-desktop</groupid>
       <groupid>input-methods</groupid>
       <groupid>kde-desktop</groupid>
       <groupid>legacy-fonts</groupid>
@@ -7129,6 +7229,18 @@
       <groupid>xmonad-mate</groupid>
     </optionlist>
   </environment>
+  <category>
+    <id>hawaii-desktop-environment</id>
+    <_name>Hawaii Desktop</_name>
+    <_description>Hawaii is a fast, lightweight, intuitive and user friendly Wayland desktop environment that adapts to desktop and mobile devices.</_description>
+    <display_order>24</display_order>
+    <grouplist>
+      <groupid>hawaii-apps</groupid>
+      <groupid>hawaii-desktop</groupid>
+      <groupid>hawaii-media</groupid>
+      <groupid>hawaii-office</groupid>
+    </grouplist>
+  </category>
   <category>
     <id>kde-desktop-environment</id>
     <_name>KDE Desktop</_name>