diff --git a/package.json b/package.json
index 8e34711..d1ad824 100644
--- a/package.json
+++ b/package.json
@@ -189,7 +189,7 @@
     "uint8arraylist": "^2.3.2"
   },
   "devDependencies": {
-    "aegir": "^38.1.7",
+    "aegir": "^39.0.10",
     "it-all": "^3.0.1",
     "it-pair": "^2.0.6",
     "it-pipe": "^3.0.0",
diff --git a/src/address-sort.ts b/src/address-sort.ts
index b9a1ced..3df8aba 100644
--- a/src/address-sort.ts
+++ b/src/address-sort.ts
@@ -20,8 +20,8 @@
  * ```
  */
 
-import type { Address } from '@libp2p/interface-peer-store'
 import { isPrivate } from './multiaddr/is-private.js'
+import type { Address } from '@libp2p/interface-peer-store'
 
 /**
  * Compare function for array.sort().
diff --git a/src/ip-port-to-multiaddr.ts b/src/ip-port-to-multiaddr.ts
index bb80dcb..bff7020 100644
--- a/src/ip-port-to-multiaddr.ts
+++ b/src/ip-port-to-multiaddr.ts
@@ -1,7 +1,7 @@
-import { logger } from '@libp2p/logger'
-import { Multiaddr, multiaddr } from '@multiformats/multiaddr'
-import { CodeError } from '@libp2p/interfaces/errors'
 import { Address4, Address6 } from '@achingbrain/ip-address'
+import { CodeError } from '@libp2p/interfaces/errors'
+import { logger } from '@libp2p/logger'
+import { type Multiaddr, multiaddr } from '@multiformats/multiaddr'
 
 const log = logger('libp2p:ip-port-to-multiaddr')
 
diff --git a/src/multiaddr/is-private.ts b/src/multiaddr/is-private.ts
index b787e64..ab563e0 100644
--- a/src/multiaddr/is-private.ts
+++ b/src/multiaddr/is-private.ts
@@ -1,5 +1,5 @@
-import type { Multiaddr } from '@multiformats/multiaddr'
 import isIpPrivate from 'private-ip'
+import type { Multiaddr } from '@multiformats/multiaddr'
 
 /**
  * Check if a given multiaddr has a private address.
diff --git a/src/stream-to-ma-conn.ts b/src/stream-to-ma-conn.ts
index 714c395..3fa09da 100644
--- a/src/stream-to-ma-conn.ts
+++ b/src/stream-to-ma-conn.ts
@@ -1,7 +1,7 @@
-import { abortableSource } from 'abortable-iterator'
 import { logger } from '@libp2p/logger'
-import type { Multiaddr } from '@multiformats/multiaddr'
+import { abortableSource } from 'abortable-iterator'
 import type { MultiaddrConnection } from '@libp2p/interface-connection'
+import type { Multiaddr } from '@multiformats/multiaddr'
 import type { Duplex, Source } from 'it-stream-types'
 import type { Uint8ArrayList } from 'uint8arraylist'
 
diff --git a/test/address-sort.spec.ts b/test/address-sort.spec.ts
index 2c20ca4..39ede62 100644
--- a/test/address-sort.spec.ts
+++ b/test/address-sort.spec.ts
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 
-import { expect } from 'aegir/chai'
 import { multiaddr } from '@multiformats/multiaddr'
+import { expect } from 'aegir/chai'
 import { publicAddressesFirst } from '../src/address-sort.js'
 
 describe('address-sort', () => {
diff --git a/test/array-equals.spec.ts b/test/array-equals.spec.ts
index 8de93ab..7b50b76 100644
--- a/test/array-equals.spec.ts
+++ b/test/array-equals.spec.ts
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 
-import { expect } from 'aegir/chai'
 import { multiaddr } from '@multiformats/multiaddr'
+import { expect } from 'aegir/chai'
 import { arrayEquals } from '../src/array-equals.js'
 
 describe('non primitive array equals', () => {
diff --git a/test/multiaddr/is-loopback.spec.ts b/test/multiaddr/is-loopback.spec.ts
index cafed69..3aa79ca 100644
--- a/test/multiaddr/is-loopback.spec.ts
+++ b/test/multiaddr/is-loopback.spec.ts
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 
-import { expect } from 'aegir/chai'
 import { multiaddr } from '@multiformats/multiaddr'
+import { expect } from 'aegir/chai'
 import { isLoopback } from '../../src/multiaddr/is-loopback.js'
 
 describe('multiaddr isLoopback', () => {
diff --git a/test/multiaddr/is-private.spec.ts b/test/multiaddr/is-private.spec.ts
index f386299..a5a12f6 100644
--- a/test/multiaddr/is-private.spec.ts
+++ b/test/multiaddr/is-private.spec.ts
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 
-import { expect } from 'aegir/chai'
 import { multiaddr } from '@multiformats/multiaddr'
+import { expect } from 'aegir/chai'
 import { isPrivate } from '../../src/multiaddr/is-private.js'
 
 describe('multiaddr isPrivate', () => {
diff --git a/test/stream-to-ma-conn.spec.ts b/test/stream-to-ma-conn.spec.ts
index d3e588b..470cb85 100644
--- a/test/stream-to-ma-conn.spec.ts
+++ b/test/stream-to-ma-conn.spec.ts
@@ -1,12 +1,12 @@
 /* eslint-env mocha */
 
+import { multiaddr } from '@multiformats/multiaddr'
 import { expect } from 'aegir/chai'
+import all from 'it-all'
 import { pair } from 'it-pair'
 import { pipe } from 'it-pipe'
-import { multiaddr } from '@multiformats/multiaddr'
-import { streamToMaConnection } from '../src/stream-to-ma-conn.js'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
-import all from 'it-all'
+import { streamToMaConnection } from '../src/stream-to-ma-conn.js'
 import type { Stream } from '@libp2p/interface-connection'
 import type { Duplex, Source } from 'it-stream-types'
 import type { Uint8ArrayList } from 'uint8arraylist'
@@ -69,7 +69,7 @@ describe('Convert stream into a multiaddr connection', () => {
     const streamData = await pipe(
       [data],
       maConn,
-      async (source) => await all(source)
+      async (source) => all(source)
     )
 
     expect(streamData).to.eql([data])