diff --git a/assets/icons/png/appflowy.png b/assets/icons/png/appflowy.png
new file mode 100644
index 000000000..3f0ba7119
Binary files /dev/null and b/assets/icons/png/appflowy.png differ
diff --git a/assets/icons/svg/appflowy.svg b/assets/icons/svg/appflowy.svg
new file mode 100644
index 000000000..3958a1a25
--- /dev/null
+++ b/assets/icons/svg/appflowy.svg
@@ -0,0 +1,29 @@
+<svg width="41" height="40" viewBox="0 0 41 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+        d="M39.9564 24.0195C38.8098 30.1683 33.7828 35.5321 28.0061 38.5411C27.3005 38.9336 26.4627 39.1516 25.6689 39.1952H37.9279C39.1185 39.1952 39.9564 38.323 39.9564 37.2328V24.0195Z"
+        fill="#F7931E" />
+    <path
+        d="M15.4381 12.1576C15.2617 12.2884 15.0853 12.4192 14.9089 12.55C11.9103 14.6432 2.82634 21.3589 0.753788 18.4371C-1.27467 15.6026 0.886079 7.57868 6.08952 3.69755C6.17771 3.61033 6.31 3.56672 6.3982 3.4795C12.0867 -0.48885 16.32 0.078058 18.3926 2.95621C20.3328 5.65992 18.1721 9.93353 15.4381 12.1576Z"
+        fill="#8427E0" />
+    <path
+        d="M33.8715 36.098C33.7833 36.1852 33.6951 36.2288 33.5628 36.316C27.8743 40.2844 23.641 39.7175 21.5684 36.8393C19.6282 34.1356 21.7889 29.862 24.5229 27.638C24.6993 27.5072 24.8757 27.3763 25.0521 27.2455C28.0507 25.1959 37.1347 18.4366 39.1631 21.3584C41.2357 24.1929 39.119 32.2169 33.8715 36.098Z"
+        fill="#FFBD00" />
+    <path
+        d="M17.9954 38.8459C15.085 40.8955 6.70658 38.6715 2.87014 33.264C2.78195 33.1768 2.69376 33.046 2.64966 32.9588C-1.09858 27.5078 -0.481224 23.4086 2.38508 21.4462C5.20728 19.4838 9.61698 21.7515 11.8218 24.586C11.91 24.7168 11.9982 24.804 12.0864 24.9349C14.159 27.8566 20.9499 36.8399 17.9954 38.8459Z"
+        fill="#E3006D" />
+    <path
+        d="M15.4385 12.1576C11.3816 13.9455 2.73857 17.6086 1.45976 14.6432C0.357338 12.1576 2.3858 7.09899 6.08994 3.69755C6.17814 3.61033 6.31043 3.56672 6.39862 3.4795C12.0871 -0.48885 16.3204 0.078058 18.393 2.95621C20.3333 5.65992 18.1725 9.93353 15.4385 12.1576Z"
+        fill="#9327FF" />
+    <path
+        d="M37.6624 18.3955C34.8402 20.3579 30.4305 18.0903 28.2257 15.2557C28.1375 15.1249 28.0493 15.0377 27.9611 14.9069C25.8444 11.9415 19.0535 2.95819 21.9639 0.952211C24.8743 -1.09738 33.2968 1.12664 37.1333 6.53407C37.2215 6.6649 37.3096 6.75211 37.3978 6.88294C41.102 12.334 40.5287 16.3895 37.6624 18.3955Z"
+        fill="#00B5FF" />
+    <path
+        d="M37.6628 18.3934C34.8406 20.3557 30.4309 18.0881 28.2261 15.2536C26.4181 11.1108 22.9344 2.95603 25.8448 1.73499C28.4906 0.601179 33.9587 2.86881 37.4423 6.88077C41.1024 12.3318 40.5291 16.3874 37.6628 18.3934Z"
+        fill="#00C8FF" />
+    <path
+        d="M33.8715 36.0986C33.7833 36.1858 33.6951 36.2294 33.5628 36.3166C27.8743 40.285 23.641 39.7181 21.5684 36.8399C19.6282 34.1362 21.7889 29.8626 24.5229 27.6386C28.5799 25.8506 37.2229 22.1875 38.5017 25.1529C39.6482 27.6386 37.6197 32.6971 33.8715 36.0986Z"
+        fill="#FFCE00" />
+    <path
+        d="M14.2031 38.061C11.5572 39.1948 6.08922 36.9708 2.64966 32.9588C-1.09858 27.5078 -0.481224 23.4086 2.38508 21.4462C5.20728 19.4838 9.61698 21.7515 11.8218 24.586C13.6298 28.6852 17.1135 36.8399 14.2031 38.061Z"
+        fill="#FB006D" />
+</svg>
\ No newline at end of file
diff --git a/modules/desktop/graphics/demo-apps.nix b/modules/desktop/graphics/demo-apps.nix
index 5c10fc072..b0633e3d1 100644
--- a/modules/desktop/graphics/demo-apps.nix
+++ b/modules/desktop/graphics/demo-apps.nix
@@ -39,6 +39,7 @@ in {
     gala-app = mkProgramOption "Gala App" false;
     element-desktop = mkProgramOption "Element desktop" config.ghaf.graphics.enableDemoApplications;
     zathura = mkProgramOption "zathura" config.ghaf.graphics.enableDemoApplications;
+    appflowy = mkProgramOption "Appflowy" config.ghaf.graphics.enableDemoApplications;
   };
 
   config = lib.mkIf config.ghaf.profiles.graphics.enable {
@@ -67,12 +68,18 @@ in {
         name = "zathura";
         path = "${pkgs.zathura}/bin/zathura";
         icon = "${pkgs.zathura}/share/icons/hicolor/32x32/apps/org.pwmt.zathura.png";
+      }
+      ++ lib.optional (cfg.appflowy && pkgs.stdenv.isx86_64) {
+        name = "appflowy";
+        path = "${pkgs.appflowy}/bin/appflowy";
+        icon = ../../../assets/icons/svg/appflowy.svg;
       };
     environment.systemPackages =
       lib.optional cfg.chromium pkgs.chromium
       ++ lib.optional cfg.element-desktop pkgs.element-desktop
       ++ lib.optional cfg.firefox pkgs.firefox
       ++ lib.optional cfg.gala-app pkgs.gala-app
-      ++ lib.optional cfg.zathura pkgs.zathura;
+      ++ lib.optional cfg.zathura pkgs.zathura
+      ++ lib.optional (cfg.appflowy && pkgs.stdenv.isx86_64) pkgs.appflowy;
   };
 }
diff --git a/targets/lenovo-x1/appvms/appflowy.nix b/targets/lenovo-x1/appvms/appflowy.nix
new file mode 100644
index 000000000..3a3cc813e
--- /dev/null
+++ b/targets/lenovo-x1/appvms/appflowy.nix
@@ -0,0 +1,20 @@
+# Copyright 2024 TII (SSRC) and the Ghaf contributors
+# SPDX-License-Identifier: Apache-2.0
+#
+{
+  pkgs,
+  config,
+  ...
+}: {
+  name = "appflowy";
+  packages = [pkgs.appflowy];
+  macAddress = "02:00:00:03:08:01";
+  ramMb = 512;
+  cores = 1;
+  extraModules = [
+    {
+      hardware.opengl.enable = true;
+      time.timeZone = config.time.timeZone;
+    }
+  ];
+}
diff --git a/targets/lenovo-x1/appvms/default.nix b/targets/lenovo-x1/appvms/default.nix
index dd8d3596f..e93302a20 100644
--- a/targets/lenovo-x1/appvms/default.nix
+++ b/targets/lenovo-x1/appvms/default.nix
@@ -1,14 +1,27 @@
 # Copyright 2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 #
-{pkgs, ...}: let
+{
+  pkgs,
+  config,
+  ...
+}: let
   chromium = import ./chromium.nix {inherit pkgs;};
   gala = import ./gala.nix {inherit pkgs;};
   zathura = import ./zathura.nix {inherit pkgs;};
   element = import ./element.nix {inherit pkgs;};
-in [
-  chromium
-  gala
-  zathura
-  element
-]
+  includeAppflowy = pkgs.stdenv.isx86_64;
+  appflowy =
+    if includeAppflowy
+    then import ./appflowy.nix {inherit pkgs config;}
+    else {};
+  appvms =
+    [
+      chromium
+      gala
+      zathura
+      element
+    ]
+    ++ pkgs.lib.optional includeAppflowy appflowy;
+in
+  appvms
diff --git a/targets/lenovo-x1/everything.nix b/targets/lenovo-x1/everything.nix
index fb24b326e..63cd7cab6 100644
--- a/targets/lenovo-x1/everything.nix
+++ b/targets/lenovo-x1/everything.nix
@@ -104,7 +104,7 @@
               };
               virtualization.microvm.appvm = {
                 enable = true;
-                vms = import ./appvms/default.nix {inherit pkgs;};
+                vms = import ./appvms/default.nix {inherit pkgs config;};
               };
 
               # Enable all the default UI applications
diff --git a/targets/lenovo-x1/guivmExtraModules.nix b/targets/lenovo-x1/guivmExtraModules.nix
index f360dc1f9..11384919d 100644
--- a/targets/lenovo-x1/guivmExtraModules.nix
+++ b/targets/lenovo-x1/guivmExtraModules.nix
@@ -68,6 +68,12 @@
         icon = "${../../assets/icons/png/element.png}";
       }
 
+      {
+        name = "appflowy";
+        path = "${pkgs.openssh}/bin/ssh -i ${configH.ghaf.security.sshKeys.sshKeyPath} -o StrictHostKeyChecking=no appflowy-vm.ghaf run-waypipe appflowy";
+        icon = "${../../assets/icons/svg/appflowy.svg}";
+      }
+
       {
         name = "windows";
         path = "${pkgs.virt-viewer}/bin/remote-viewer -f spice://${winConfig.spice-host}:${toString winConfig.spice-port}";