diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 598f07461..4f1e0412a 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,25 +1,42 @@
 name: keepassxc
+summary: "KeePassXC: Secure, Community-Driven Password Management"
+description: |
+  KeePassXC is an advanced password manager that continues the legacy of KeePassX.
+  It offers secure storage for your passwords in an encrypted database, with a modern,
+  user-friendly experience that adapts to your desktop environment.
+
 adopt-info: keepassxc
 grade: stable
-base: core22
+base: core24
 confinement: strict
-compression: lzo
+compression: zstd
 
 apps:
   keepassxc:
-    command: usr/bin/keepassxc
-    common-id: org.keepassxc.KeePassXC.desktop
-    extensions: [kde-neon]
-    plugs: [home, unity7, network, network-bind, removable-media, raw-usb, password-manager-service, browser-native-messaging]
-    autostart: org.keepassxc.KeePassXC.desktop
+    # Use desktop-launch to improve integration
+    command: desktop-launch usr/bin/keepassxc
+    desktop: usr/share/applications/org.keepassxc.KeePassXC.desktop
+    extensions: [qt5-base]
+    plugs:
+      - home
+      - unity7
+      - network
+      - network-bind
+      - removable-media
+      - raw-usb
+      - password-manager-service
+      - browser-native-messaging
+
   cli:
     command: usr/bin/keepassxc-cli
-    extensions: [kde-neon]
+    extensions: [qt5-base]
     plugs: [home, removable-media, raw-usb]
+
   proxy:
     command: usr/bin/keepassxc-proxy
-    extensions: [kde-neon]
+    extensions: [qt5-base]
 
+# Enable direct access to the native messaging host configuration files
 plugs:
   browser-native-messaging:
     interface: personal-files
@@ -32,6 +49,13 @@ plugs:
       - $HOME/.config/BraveSoftware/Brave-Browser/NativeMessagingHosts/org.keepassxc.keepassxc_browser.json
       - $HOME/.local/share/torbrowser/tbb/x86_64/tor-browser_en-US/Browser/TorBrowser/Data/Browser/.mozilla/native-messaging-hosts/org.keepassxc.keepassxc_browser.json
 
+# Improve desktop integration
+layout:
+  /usr/share/X11/locale:
+    bind: $SNAP/usr/share/X11/locale
+  /usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qt5/plugins:
+    bind: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qt5/plugins
+
 slots:
   session-dbus-interface:
     interface: dbus
@@ -78,8 +102,8 @@ parts:
       - libfreetype6
       - xclip
       - libkeyutils1
+
 lint:
   ignore:
     - library:
       - lib/**/libhistory.so*
-