diff --git a/snapcraft.yaml b/snapcraft.yaml
index 8f3cc9d..88d5189 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -11,7 +11,7 @@ description: |
 
 grade: stable # must be 'stable' to release into candidate/stable channels
 confinement: strict
-base: core20
+base: core22
 
 # Launchpad doesn't recognize these fields yet
 passthrough:
@@ -28,7 +28,7 @@ slots:
 apps:
   lightsoff:
     command: usr/bin/lightsoff
-    extensions: [gnome-3-38]
+    extensions: [gnome]
     plugs:
       - gsettings
       - opengl
@@ -37,33 +37,20 @@ apps:
       GSETTINGS_SCHEMA_DIR: $SNAP/share/glib-2.0/schemas
 
 parts:
-# Needed by clutter
-  snapcraft-preload:
-    source: https://github.com/sergiusens/snapcraft-preload.git
-    plugin: cmake
-    build-packages:
-      - gcc-multilib
-      - g++-multilib
-
   lightsoff:
     source: https://gitlab.gnome.org/GNOME/lightsoff.git
     source-type: git
     source-tag: '40.0.1'
-    override-pull: |
-      snapcraftctl pull
-      snapcraftctl set-version $(git describe --tags --abbrev=10)
+    parse-info: [usr/share/metainfo/org.gnome.LightsOff.appdata.xml]
     override-build: |
-      sed -i.bak -e 's|Icon=org.gnome.LightsOff$|Icon=${SNAP}/meta/gui/org.gnome.LightsOff.svg|g' $SNAPCRAFT_PART_SRC/data/org.gnome.LightsOff.desktop.in
-      snapcraftctl build
-      mkdir -p $SNAPCRAFT_PART_INSTALL/meta/gui/
-      cp ../src/data/icons/hicolor/scalable/apps/org.gnome.LightsOff.svg $SNAPCRAFT_PART_INSTALL/meta/gui/
-      cp $SNAPCRAFT_PART_BUILD/data/org.gnome.LightsOff.desktop $SNAPCRAFT_PART_INSTALL/meta/gui/
+      sed -i.bak -e 's|Icon=org.gnome.LightsOff$|Icon=${SNAP}/meta/gui/org.gnome.LightsOff.svg|g' $CRAFT_PART_SRC/data/org.gnome.LightsOff.desktop.in
+      craftctl default
+      mkdir -p $CRAFT_PART_INSTALL/meta/gui/
+      cp $CRAFT_PART_SRC/data/icons/hicolor/scalable/apps/org.gnome.LightsOff.svg $CRAFT_PART_INSTALL/meta/gui/
     plugin: meson
-    meson-parameters: [--prefix=/snap/lightsoff/current/usr]
-    organize:
-      snap/lightsoff/current/usr: usr
+    meson-parameters:
+      - --prefix=/usr
     build-packages:
-      - libclutter-gtk-1.0-dev
       - on amd64:
         - gcc-multilib
         - g++-multilib