diff --git a/Cargo.lock b/Cargo.lock
index f4bb209..8a11c10 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -310,12 +310,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
 [[package]]
 name = "base64"
 version = "0.21.7"
@@ -1616,10 +1610,10 @@ name = "rebuildctl"
 version = "0.20.0"
 dependencies = [
  "atty",
- "base64 0.13.1",
  "bzip2",
  "chrono",
  "colored",
+ "data-encoding",
  "dirs-next",
  "env_logger 0.9.3",
  "flate2",
diff --git a/tools/Cargo.toml b/tools/Cargo.toml
index f84c95e..abde0a8 100644
--- a/tools/Cargo.toml
+++ b/tools/Cargo.toml
@@ -41,4 +41,4 @@ regex = "1.5.6"
 url = "2.2.2"
 
 [dev-dependencies]
-base64 = "0.13.0"
+data-encoding = "2"
diff --git a/tools/src/decompress.rs b/tools/src/decompress.rs
index 64a3022..b418497 100644
--- a/tools/src/decompress.rs
+++ b/tools/src/decompress.rs
@@ -44,6 +44,7 @@ pub fn stream<'a>(comp: CompressedWith, bytes: &'a [u8]) -> Result<Box<dyn Read
 #[cfg(test)]
 mod tests {
     use super::*;
+    use data_encoding::BASE64;
 
     #[test]
     fn detect_no_compression() {
@@ -62,14 +63,14 @@ mod tests {
 
     #[test]
     fn detect_gzip_compression() {
-        let bytes = base64::decode("H4sIAAAAAAAAA8vPSMzkAgCKUC0+BQAAAA==").unwrap();
+        let bytes = BASE64.decode(b"H4sIAAAAAAAAA8vPSMzkAgCKUC0+BQAAAA==").unwrap();
         let comp = detect_compression(&bytes);
         assert_eq!(comp, CompressedWith::Gzip);
     }
 
     #[test]
     fn decompress_gzip_compression() {
-        let bytes = base64::decode("H4sIAAAAAAAAA8vPSMzkAgCKUC0+BQAAAA==").unwrap();
+        let bytes = BASE64.decode(b"H4sIAAAAAAAAA8vPSMzkAgCKUC0+BQAAAA==").unwrap();
         let comp = detect_compression(&bytes);
         assert_eq!(comp, CompressedWith::Gzip);
 
@@ -80,14 +81,14 @@ mod tests {
 
     #[test]
     fn detect_bzip2_compression() {
-        let bytes = base64::decode("QlpoOTFBWSZTWZ+CN7sAAAJBAAAQIGCgADDNAMGmwHF3JFOFCQn4I3uw").unwrap();
+        let bytes = BASE64.decode(b"QlpoOTFBWSZTWZ+CN7sAAAJBAAAQIGCgADDNAMGmwHF3JFOFCQn4I3uw").unwrap();
         let comp = detect_compression(&bytes);
         assert_eq!(comp, CompressedWith::Bzip2);
     }
 
     #[test]
     fn decompress_bzip2_compression() {
-        let bytes = base64::decode("QlpoOTFBWSZTWZ+CN7sAAAJBAAAQIGCgADDNAMGmwHF3JFOFCQn4I3uw").unwrap();
+        let bytes = BASE64.decode(b"QlpoOTFBWSZTWZ+CN7sAAAJBAAAQIGCgADDNAMGmwHF3JFOFCQn4I3uw").unwrap();
         let comp = detect_compression(&bytes);
         assert_eq!(comp, CompressedWith::Bzip2);
 
@@ -98,14 +99,14 @@ mod tests {
 
     #[test]
     fn detect_xz_compression() {
-        let bytes = base64::decode("/Td6WFoAAATm1rRGAgAhARYAAAB0L+WjAQAEb2hhaQoAAAAACyuekVbXbHMAAR0FuC2Arx+2830BAAAAAARZWg==").unwrap();
+        let bytes = BASE64.decode(b"/Td6WFoAAATm1rRGAgAhARYAAAB0L+WjAQAEb2hhaQoAAAAACyuekVbXbHMAAR0FuC2Arx+2830BAAAAAARZWg==").unwrap();
         let comp = detect_compression(&bytes);
         assert_eq!(comp, CompressedWith::Xz);
     }
 
     #[test]
     fn decompress_xz_compression() {
-        let bytes = base64::decode("/Td6WFoAAATm1rRGAgAhARYAAAB0L+WjAQAEb2hhaQoAAAAACyuekVbXbHMAAR0FuC2Arx+2830BAAAAAARZWg==").unwrap();
+        let bytes = BASE64.decode(b"/Td6WFoAAATm1rRGAgAhARYAAAB0L+WjAQAEb2hhaQoAAAAACyuekVbXbHMAAR0FuC2Arx+2830BAAAAAARZWg==").unwrap();
         let comp = detect_compression(&bytes);
         assert_eq!(comp, CompressedWith::Xz);
 
@@ -116,14 +117,14 @@ mod tests {
 
     #[test]
     fn detect_zstd_compression() {
-        let bytes = base64::decode("KLUv/QRYKQAAb2hhaQpnBE++").unwrap();
+        let bytes = BASE64.decode(b"KLUv/QRYKQAAb2hhaQpnBE++").unwrap();
         let comp = detect_compression(&bytes);
         assert_eq!(comp, CompressedWith::Zstd);
     }
 
     #[test]
     fn decompress_zstd_compression() {
-        let bytes = base64::decode("KLUv/QRYKQAAb2hhaQpnBE++").unwrap();
+        let bytes = BASE64.decode(b"KLUv/QRYKQAAb2hhaQpnBE++").unwrap();
         let comp = detect_compression(&bytes);
         assert_eq!(comp, CompressedWith::Zstd);