diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index cd2f23ad78813b57bd4aafa306a4ec502cae5d3f..5dbfb0a35f54b89b69547c0102c6629f13dd510a 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -192,54 +192,55 @@ parts:
       # needed by solr to determine locally running ports
       - lsof
       # TODO may be needed by openjfx
+      - libopenjfx-java
       # taken from https://github.com/jgneff/openjfx/blob/edge/snap/snapcraft.yaml
-      - libatk1.0-0
-      - libatk-bridge2.0-0
-      - libatspi2.0-0
-      - libcairo2
-      - libcairo-gobject2
-      - libdatrie1
-      - libepoxy0
-      - libfontconfig1
-      - libfreetype6
-      - libgdk-pixbuf2.0-0
-      - libgl1
-      - libglvnd0
-      - libglx0
-      - libgraphite2-3
-      - libgtk2.0-0
-      - libgtk-3-0
-      - libharfbuzz0b
-      - libpango-1.0-0
-      - libpangocairo-1.0-0
-      - libpangoft2-1.0-0
-      - libpixman-1-0
-      - libpng16-16
-      - libthai0
-      - libwayland-client0
-      - libwayland-cursor0
-      - libwayland-egl1
-      - libx11-6
-      - libxau6
-      - libxcb1
-      - libxcb-render0
-      - libxcb-shm0
-      - libxcomposite1
-      - libxcursor1
-      - libxdamage1
-      - libxdmcp6
-      - libxext6
-      - libxfixes3
-      - libxi6
-      - libxinerama1
-      - libxkbcommon0
-      - libxrandr2
-      - libxrender1
-      - libxtst6
-      # Gtk-Message: 16:12:52.145: Failed to load module "canberra-gtk-module"
-      - libcanberra-gtk3-module
-      # Gtk-Message: 10:57:54.572: Failed to load module "pk-gtk-module"
-      - packagekit-gtk3-module
+      # - libatk1.0-0
+      # - libatk-bridge2.0-0
+      # - libatspi2.0-0
+      # - libcairo2
+      # - libcairo-gobject2
+      # - libdatrie1
+      # - libepoxy0
+      # - libfontconfig1
+      # - libfreetype6
+      # - libgdk-pixbuf2.0-0
+      # - libgl1
+      # - libglvnd0
+      # - libglx0
+      # - libgraphite2-3
+      # - libgtk2.0-0
+      # - libgtk-3-0
+      # - libharfbuzz0b
+      # - libpango-1.0-0
+      # - libpangocairo-1.0-0
+      # - libpangoft2-1.0-0
+      # - libpixman-1-0
+      # - libpng16-16
+      # - libthai0
+      # - libwayland-client0
+      # - libwayland-cursor0
+      # - libwayland-egl1
+      # - libx11-6
+      # - libxau6
+      # - libxcb1
+      # - libxcb-render0
+      # - libxcb-shm0
+      # - libxcomposite1
+      # - libxcursor1
+      # - libxdamage1
+      # - libxdmcp6
+      # - libxext6
+      # - libxfixes3
+      # - libxi6
+      # - libxinerama1
+      # - libxkbcommon0
+      # - libxrandr2
+      # - libxrender1
+      # - libxtst6
+      # # Gtk-Message: 16:12:52.145: Failed to load module "canberra-gtk-module"
+      # - libcanberra-gtk3-module
+      # # Gtk-Message: 10:57:54.572: Failed to load module "pk-gtk-module"
+      # - packagekit-gtk3-module
     plugin: nil
     # source: https://github.com/sleuthkit/autopsy.git
     source: https://github.com/gdicristofaro/autopsy.git
@@ -280,6 +281,8 @@ parts:
       cat <<EOF > $AUTOPSY_LOCATION/bin/autopsywrapper.sh
       #!/bin/bash
       mkdir -p \$HOME/tmp
+      echo libs in gnome-platform:
+      find \$SNAP_DESKTOP_RUNTIME -name *.so
       echo Starting Autopsy...
       \$SNAP/autopsy/bin/autopsy
       EOF
@@ -291,23 +294,25 @@ parts:
       # sed -i '129 i ' "$AUTOPSY_LOCATION/platform/lib/nbexec"
 
 
-  # taken from https://github.com/ubuntu/thunderbird/blob/stable/snapcraft.yaml
-  # Find files provided by the base and platform snap and ensure they aren't
-  # duplicated in this snap
+  # taken from https://github.com/ubuntu/gnome-recipes/blob/stable/snapcraft.yaml
   cleanup:
-    after: [autopsy]
+    after: [ autopsy ]
     plugin: nil
-    # NOTE: this will likely change as gnome extension has new revisions
-    build-snaps: [core22]
+    build-snaps: [core22, gtk-common-themes, gnome-42-2204]
     override-prime: |
       set -eux
-      for snap in "core22"; do
-        cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" \;
+      for snap in "core22" "gtk-common-themes" "gnome-42-2204"; do
+        cd "/snap/$snap/current" && find . -type f,l -name *.so.* -exec rm -f "$CRAFT_PRIME/{}" \;
+      done
+      # remove cross-installed repeated libraries (in /usr/lib in the SDK, but in /usr/lib/TRIPLET
+      # here, and the opposite)
+      for snap in "core22" "gnome-42-2204"; do
+        cd "/snap/$snap/current/usr/lib"
+        for filename in [ *.so* ]; do
+          rm -f "$CRAFT_PRIME/usr/lib/$CRAFT_ARCH_TRIPLET/$filename"
+        done
+        cd "/snap/$snap/current/usr/lib/$CRAFT_ARCH_TRIPLET"
+        for filename in [ *.so* ]; do
+          rm -f "$CRAFT_PRIME/usr/lib/$filename"
+        done
       done
-    # TODO remove if effective
-    #build-snaps: [core22, gnome-42-2204]
-    # override-prime: |
-    #   set -eux
-    #   for snap in "core22" "gnome-42-2204"; do
-    #     cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" \;
-    #   done