diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9ba63d0..8ba7706 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,7 +22,8 @@ jobs:
             label: Windows,
             runner: windows-latest
           }
-        nim: [1.6.18]
+        # Earliest supported and latest nim
+        nim: [1.6.18, "stable"]
     name: ${{ matrix.platform.icon }} ${{ matrix.platform.label }} - Nim v${{ matrix.nim }}
     runs-on: ${{ matrix.platform.runner }}
     defaults:
@@ -32,9 +33,10 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: recursive
-    - uses: iffy/install-nim@v5
+    - uses: jiro4989/setup-nim-action@v2
       with:
-        version: ${{ matrix.nim }}
+        nim-version: ${{matrix.nim}}
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Install
       run: nimble install -y
     - name: Build and run tests
diff --git a/.gitignore b/.gitignore
index 1d01e08..d1d1ca6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ TODO
 
 nimble.develop
 nimble.paths
+nimbledeps
diff --git a/config.nims b/config.nims
index 063e9b5..e9cd4a7 100644
--- a/config.nims
+++ b/config.nims
@@ -2,7 +2,8 @@
 --styleCheck:error
 --threads:on
 --tlsEmulation:off
-# begin Nimble config (version 1)
-when fileExists("nimble.paths"):
+# begin Nimble config (version 2)
+--noNimblePath
+when withDir(thisDir(), system.fileExists("nimble.paths")):
   include "nimble.paths"
 # end Nimble config
diff --git a/leopard.nimble b/leopard.nimble
index 2d41950..639cd06 100644
--- a/leopard.nimble
+++ b/leopard.nimble
@@ -1,13 +1,12 @@
 mode = ScriptMode.Verbose
 
 packageName   = "leopard"
-version       = "0.1.0"
+version       = "0.1.1"
 author        = "Status Research & Development GmbH"
 description   = "A wrapper for Leopard-RS"
 license       = "Apache License 2.0 or MIT"
 installDirs   = @["vendor"]
 
 requires "nim >= 1.6.0",
-         "stew",
          "unittest2",
-         "upraises >= 0.1.0 & < 0.2.0"
+         "results"
diff --git a/leopard/leopard.nim b/leopard/leopard.nim
index 71d23ee..26400ca 100644
--- a/leopard/leopard.nim
+++ b/leopard/leopard.nim
@@ -7,12 +7,9 @@
 ## This file may not be copied, modified, or distributed except according to
 ## those terms.
 
-import pkg/upraises
-push: {.upraises: [].}
+{.push raises: [].}
 
-{.deadCodeElim: on.}
-
-import pkg/stew/results
+import pkg/results
 
 import ./wrapper
 import ./utils
diff --git a/leopard/utils/allocs.nim b/leopard/utils/allocs.nim
index 671ffb6..6e1fd1f 100644
--- a/leopard/utils/allocs.nim
+++ b/leopard/utils/allocs.nim
@@ -7,10 +7,7 @@
 ## This file may not be copied, modified, or distributed except according to
 ## those terms.
 
-import pkg/upraises
-push: {.upraises: [].}
-
-{.deadCodeElim: on.}
+{.push raises: [].}
 
 import system/ansi_c
 
diff --git a/leopard/utils/cpuinfo_x86.nim b/leopard/utils/cpuinfo_x86.nim
index ce31069..88115b5 100644
--- a/leopard/utils/cpuinfo_x86.nim
+++ b/leopard/utils/cpuinfo_x86.nim
@@ -7,10 +7,7 @@
 ## This file may not be copied, modified, or distributed except according to
 ## those terms.
 
-import pkg/upraises
-push: {.upraises: [].}
-
-{.deadCodeElim: on.}
+{.push raises: [].}
 
 # From awr1: https://github.com/nim-lang/Nim/pull/11816/files
 
diff --git a/leopard/wrapper.nim b/leopard/wrapper.nim
index 90d8b5a..eeb8d5d 100644
--- a/leopard/wrapper.nim
+++ b/leopard/wrapper.nim
@@ -57,8 +57,7 @@
 ## Conference on File and Storage Technologies, San Jose, 2013
 
 
-import pkg/upraises
-push: {.upraises: [].}
+{.push raises: [].}
 
 ## -----------------------------------------------------------------------------
 ## Build configuration
diff --git a/nimble.lock b/nimble.lock
index b079b94..d198557 100644
--- a/nimble.lock
+++ b/nimble.lock
@@ -1,35 +1,26 @@
 {
-  "version": 1,
+  "version": 2,
   "packages": {
     "unittest2": {
-      "version": "0.0.4",
-      "vcsRevision": "f180f596c88dfd266f746ed6f8dbebce39c824db",
-      "url": "https://github.com/status-im/nim-unittest2.git",
+      "version": "0.2.5",
+      "vcsRevision": "26f2ef3ae0ec72a2a75bfe557e02e88f6a31c189",
+      "url": "https://github.com/status-im/nim-unittest2",
       "downloadMethod": "git",
       "dependencies": [],
       "checksums": {
-        "sha1": "fa309c41eaf6ef57895b9e603f2620a2f6e11780"
+        "sha1": "02bb3751ba9ddc3c17bfd89f2e41cb6bfb8fc0c9"
       }
     },
-    "upraises": {
-      "version": "0.1.0",
-      "vcsRevision": "ff4f8108e44fba9b35cac535ab63d3927e8fd3c2",
-      "url": "https://github.com/markspanbroek/upraises.git",
+    "results": {
+      "version": "0.5.1",
+      "vcsRevision": "df8113dda4c2d74d460a8fa98252b0b771bf1f27",
+      "url": "https://github.com/arnetheduck/nim-results",
       "downloadMethod": "git",
       "dependencies": [],
       "checksums": {
-        "sha1": "a0243c8039e12d547dbb2e9c73789c16bb8bc956"
-      }
-    },
-    "stew": {
-      "version": "0.1.0",
-      "vcsRevision": "6ad35b876fb6ebe0dfee0f697af173acc47906ee",
-      "url": "https://github.com/status-im/nim-stew.git",
-      "downloadMethod": "git",
-      "dependencies": [],
-      "checksums": {
-        "sha1": "46d58c4feb457f3241e3347778334e325dce5268"
+        "sha1": "a9c011f74bc9ed5c91103917b9f382b12e82a9e7"
       }
     }
-  }
-}
\ No newline at end of file
+  },
+  "tasks": {}
+}
diff --git a/tests/helpers.nim b/tests/helpers.nim
index 3b43899..e9e8699 100644
--- a/tests/helpers.nim
+++ b/tests/helpers.nim
@@ -1,6 +1,6 @@
 import std/random
 
-import pkg/stew/results
+import pkg/results
 import ../leopard
 
 proc randomCRCPacket*(data: var openArray[byte]) =
diff --git a/tests/testleopard.nim b/tests/testleopard.nim
index 9f7b38c..9c75813 100644
--- a/tests/testleopard.nim
+++ b/tests/testleopard.nim
@@ -2,7 +2,7 @@ import std/random
 import std/sets
 
 import pkg/unittest2
-import pkg/stew/results
+import pkg/results
 
 import ../leopard
 import ./helpers