diff --git a/app/components/map.gjs b/app/components/map.gjs
index c207ec4..54642b1 100644
--- a/app/components/map.gjs
+++ b/app/components/map.gjs
@@ -16,7 +16,6 @@ import Geolocation from 'ol/Geolocation.js';
 import { Style, Circle, Fill, Stroke } from 'ol/style.js';
 import { apply } from 'ol-mapbox-style';
 import { getDistance } from '../utils/geo';
-import Icon from '../components/icon';
 
 export default class MapComponent extends Component {
   @service osm;
@@ -213,7 +212,7 @@ export default class MapComponent extends Component {
           geolocation.un('change:position', zoomToLocation);
           locateListenerKey = null;
         }
-      } catch (e) {
+      } catch {
         /* ignore */
       }
 
diff --git a/app/components/settings-pane.gjs b/app/components/settings-pane.gjs
index 631543c..ff95aca 100644
--- a/app/components/settings-pane.gjs
+++ b/app/components/settings-pane.gjs
@@ -1,10 +1,12 @@
 import Component from '@glimmer/component';
 import { on } from '@ember/modifier';
 import Icon from '#components/icon';
-import { service } from '@ember/service';
-import { action } from '@ember/object';
 
 export default class SettingsPane extends Component {
+  constructor() {
+    super(...arguments);
+  }
+
   <template>
     <div class="sidebar settings-pane">
       <div class="sidebar-header">
diff --git a/app/services/osm.js b/app/services/osm.js
index dea2a8e..02ca6fb 100644
--- a/app/services/osm.js
+++ b/app/services/osm.js
@@ -59,6 +59,7 @@ out center;
 
   async fetchWithRetry(url, options = {}, retries = 3) {
     try {
+      // eslint-disable-next-line warp-drive/no-external-request-patterns
       const res = await fetch(url, options);
 
       if (!res.ok && retries > 0 && [502, 503, 504, 429].includes(res.status)) {
diff --git a/app/services/storage.js b/app/services/storage.js
index ee23fb9..c2455b0 100644
--- a/app/services/storage.js
+++ b/app/services/storage.js
@@ -5,7 +5,7 @@ import Widget from 'remotestorage-widget';
 import { tracked } from '@glimmer/tracking';
 import { getGeohashPrefixesInBbox } from '../utils/geohash-coverage';
 import { action } from '@ember/object';
-import { debounce } from '@ember/runloop';
+import { debounceTask } from 'ember-lifeline';
 import Geohash from 'latlon-geohash';
 
 export default class StorageService extends Service {
@@ -70,7 +70,7 @@ export default class StorageService extends Service {
     this.rs.scope('/places/').on('change', (event) => {
       // console.debug(event);
       this.handlePlaceChange(event);
-      debounce(this, this.reloadCurrentView, 200);
+      debounceTask(this, 'reloadCurrentView', 200);
     });
   }
 
@@ -120,7 +120,7 @@ export default class StorageService extends Service {
 
   notifyChange() {
     this.version++;
-    debounce(this, this.reloadCurrentView, 200);
+    debounceTask(this, 'reloadCurrentView', 200);
   }
 
   reloadCurrentView() {
diff --git a/app/utils/geohash-coverage.js b/app/utils/geohash-coverage.js
index f00e206..1ec809e 100644
--- a/app/utils/geohash-coverage.js
+++ b/app/utils/geohash-coverage.js
@@ -41,6 +41,7 @@ export function getGeohashPrefixesInBbox(bbox) {
       try {
         const hash = Geohash.encode(cLat, cLon, 4);
         prefixes.add(hash);
+        // eslint-disable-next-line no-unused-vars
       } catch (e) {
         // Ignore invalid coords if any
       }
@@ -50,16 +51,28 @@ export function getGeohashPrefixesInBbox(bbox) {
   // Ensure corners are definitely included (floating point steps might miss slightly)
   try {
     prefixes.add(Geohash.encode(minLat, minLon, 4));
-  } catch (e) {}
+    // eslint-disable-next-line no-unused-vars
+  } catch (e) {
+    /* ignore */
+  }
   try {
     prefixes.add(Geohash.encode(maxLat, maxLon, 4));
-  } catch (e) {}
+    // eslint-disable-next-line no-unused-vars
+  } catch (e) {
+    /* ignore */
+  }
   try {
     prefixes.add(Geohash.encode(minLat, maxLon, 4));
-  } catch (e) {}
+    // eslint-disable-next-line no-unused-vars
+  } catch (e) {
+    /* ignore */
+  }
   try {
     prefixes.add(Geohash.encode(maxLat, minLon, 4));
-  } catch (e) {}
+    // eslint-disable-next-line no-unused-vars
+  } catch (e) {
+    /* ignore */
+  }
 
   return Array.from(prefixes);
 }
diff --git a/package.json b/package.json
index 1ab59c2..44ce479 100644
--- a/package.json
+++ b/package.json
@@ -93,5 +93,8 @@
   },
   "ember": {
     "edition": "octane"
+  },
+  "dependencies": {
+    "ember-lifeline": "^7.0.0"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bee9719..819c962 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -7,6 +7,10 @@ settings:
 importers:
 
   .:
+    dependencies:
+      ember-lifeline:
+        specifier: ^7.0.0
+        version: 7.0.0(@ember/test-helpers@5.4.1(@babel/core@7.28.6))
     devDependencies:
       '@babel/core':
         specifier: ^7.28.5
@@ -2254,6 +2258,15 @@ packages:
       '@typescript-eslint/parser':
         optional: true
 
+  ember-lifeline@7.0.0:
+    resolution: {integrity: sha512-2l51NzgH5vjN972zgbs+32rnXnnEFKB7qsSpJF+lBI4V5TG6DMy4SfowC72ZEuAtS58OVfwITbOO+RnM21EdpA==}
+    engines: {node: 16.* || >= 18}
+    peerDependencies:
+      '@ember/test-helpers': '>= 1.0.0'
+    peerDependenciesMeta:
+      '@ember/test-helpers':
+        optional: true
+
   ember-modifier@4.2.2:
     resolution: {integrity: sha512-pPYBAGyczX0hedGWQFQOEiL9s45KS9efKxJxUQkMLjQyh+1Uef1mcmAGsdw2KmvNupITkE/nXxmVO1kZ9tt3ag==}
 
@@ -6762,6 +6775,14 @@ snapshots:
       - eslint
       - typescript
 
+  ember-lifeline@7.0.0(@ember/test-helpers@5.4.1(@babel/core@7.28.6)):
+    dependencies:
+      '@embroider/addon-shim': 1.10.2
+    optionalDependencies:
+      '@ember/test-helpers': 5.4.1(@babel/core@7.28.6)
+    transitivePeerDependencies:
+      - supports-color
+
   ember-modifier@4.2.2(@babel/core@7.28.6):
     dependencies:
       '@embroider/addon-shim': 1.10.2