diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3f0e74f..1a0ee0e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,14 +20,6 @@ jobs:
         with:
           toolchain: stable
 
-      # Python Dependencies
-      - name: Install Python dependencies
-        run: |
-          pip3 install --user setuptools wheel
-          pip3 install --user svdtools
-      - name: Put pip binary directory into path
-        run: echo "$HOME/.local/bin" >> $GITHUB_PATH
-
       # Rust Dependencies
       - name: Cache Cargo installed binaries
         uses: actions/cache@v4
@@ -44,6 +36,9 @@ jobs:
       - name: Install atdf2svd
         if: steps.cache-cargo.outputs.cache-hit != 'true'
         run: cargo install atdf2svd --version 0.5.0 --locked
+      - name: Install svdtools
+        if: steps.cache-cargo.outputs.cache-hit != 'true'
+        run: cargo install svdtools --version 0.3.21 --locked
       - name: Copy tools to cache directory
         if: steps.cache-cargo.outputs.cache-hit != 'true'
         run: |
@@ -51,6 +46,7 @@ jobs:
           cp ~/.cargo/bin/svd2rust ~/cargo-bin
           cp ~/.cargo/bin/form ~/cargo-bin
           cp ~/.cargo/bin/atdf2svd ~/cargo-bin
+          cp ~/.cargo/bin/svdtools ~/cargo-bin
       - name: Put new cargo binary directory into path
         run: echo "$HOME/cargo-bin" >> $GITHUB_PATH
 
diff --git a/Makefile b/Makefile
index e90eead..ebb4956 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ svd/%.svd: vendor/%.atdf
 svd/%.svd.patched: svd/%.svd .deps/%.d patch/%.yaml
 	@if [ -f patch/$*.yaml ] ; then \
 		echo -e "\tPATCH\t\t$*"; \
-		svd patch patch/$*.yaml; \
+		svdtools patch patch/$*.yaml; \
 		test -e $@; \
 	else \
 		echo -e "\t  - No patches found for $*"; \
@@ -75,6 +75,6 @@ patch/%.yaml: .deps/%.d
 .deps/%.d: patch/%.yaml
 	@mkdir -p .deps
 	@echo -e "\tMAKEDEPS\t$*"
-	@svd makedeps $< $@
+	@svdtools makedeps $< $@
 
 -include $(DEPS)
diff --git a/README.md b/README.md
index d427a4a..113a197 100644
--- a/README.md
+++ b/README.md
@@ -46,14 +46,7 @@ cargo install atdf2svd --version 0.5.0 --locked
 cargo install svd2rust --version 0.28.0 --locked
 cargo install form
 rustup component add --toolchain nightly rustfmt
-pip3 install --user svdtools
-
-# check svdtools
-svd --version
-# if a "command not found" error is printed instead of a version,
-# either svdtools is installed incorrectly, or its installation path is missing from the PATH variable.
-# Temporary solution to PATH variable issue is to manually add the path. Like so:
-export PATH=$PATH:~/.local/bin
+cargo install svdtools
 ```
 
 [atdf2svd]: https://github.com/Rahix/atdf2svd
diff --git a/gen-intr-lut.sh b/gen-intr-lut.sh
index 3be5957..a343fc1 100755
--- a/gen-intr-lut.sh
+++ b/gen-intr-lut.sh
@@ -10,7 +10,7 @@ for intr_path in "$@"; do
     chip="$(basename "${intr_path%.svd.patched}")"
     echo "        \"$chip\" => match intr {"
     # toupper() to be compliant with svd2rust interrupts name
-    svd interrupts --no-gaps $intr_path | awk '{print "            \""toupper(substr($2, 1, length($2)-1))"\"" " => Some(" $1"),"}'
+    svdtools interrupts --no-gaps $intr_path | awk '{print "            \""toupper(substr($2, 1, length($2)-1))"\"" " => Some(" $1"),"}'
     echo "            _ => None,"
     echo "        },"
 done