diff --git a/packages/secrets/.gitignore b/packages/secrets/.gitignore
index b9bbb49d70..f7f636621d 100644
--- a/packages/secrets/.gitignore
+++ b/packages/secrets/.gitignore
@@ -1,3 +1,200 @@
 index.d.ts
 index.js
-index.js.map
\ No newline at end of file
+index.js.map
+# Created by https://www.toptal.com/developers/gitignore/api/node
+# Edit at https://www.toptal.com/developers/gitignore?templates=node
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+.env.test
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# Next.js build output
+.next
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# End of https://www.toptal.com/developers/gitignore/api/node
+
+# Created by https://www.toptal.com/developers/gitignore/api/macos
+# Edit at https://www.toptal.com/developers/gitignore?templates=macos
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two 
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### macOS Patch ###
+# iCloud generated files
+*.icloud
+
+# End of https://www.toptal.com/developers/gitignore/api/macos
+
+# Created by https://www.toptal.com/developers/gitignore/api/windows
+# Edit at https://www.toptal.com/developers/gitignore?templates=windows
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# End of https://www.toptal.com/developers/gitignore/api/windows
+
+#Added by cargo
+
+target
+Cargo.lock
+
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
+*.node
diff --git a/packages/secrets/package.json b/packages/secrets/package.json
index 4d9385d8cd..724071dab1 100644
--- a/packages/secrets/package.json
+++ b/packages/secrets/package.json
@@ -37,7 +37,7 @@
     "artifacts": "napi artifacts",
     "build": "tsc --pretty && cd src/keyring && napi build --config napi.json --js false --platform --release",
     "build:debug": "cd src/keyring && napi build --config napi.json --js false --platform",
-    "install": "node src/keyring/index.js || yarn rebuild",
+    "install": "node src/keyring/index.js || npm run rebuild",
     "prepack": "node ../../scripts/prepareLicenses.js",
     "prepublishOnly": "bash scripts/prebuildify.sh",
     "rebuild": "npx --yes --package=@napi-rs/cli@2.16.2 -- napi build --config src/keyring/napi.json --cargo-cwd src/keyring --platform --release --js=false src/keyring",
diff --git a/packages/secrets/src/keyring/.gitignore b/packages/secrets/src/keyring/.gitignore
deleted file mode 100644
index 5e2577b357..0000000000
--- a/packages/secrets/src/keyring/.gitignore
+++ /dev/null
@@ -1,197 +0,0 @@
-# Created by https://www.toptal.com/developers/gitignore/api/node
-# Edit at https://www.toptal.com/developers/gitignore?templates=node
-
-### Node ###
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-
-# Diagnostic reports (https://nodejs.org/api/report.html)
-report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-*.lcov
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# TypeScript v1 declaration files
-typings/
-
-# TypeScript cache
-*.tsbuildinfo
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Microbundle cache
-.rpt2_cache/
-.rts2_cache_cjs/
-.rts2_cache_es/
-.rts2_cache_umd/
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-.env.test
-
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-
-# Next.js build output
-.next
-
-# Nuxt.js build / generate output
-.nuxt
-dist
-
-# Gatsby files
-.cache/
-# Comment in the public line in if your project uses Gatsby and not Next.js
-# https://nextjs.org/blog/next-9-1#public-directory-support
-# public
-
-# vuepress build output
-.vuepress/dist
-
-# Serverless directories
-.serverless/
-
-# FuseBox cache
-.fusebox/
-
-# DynamoDB Local files
-.dynamodb/
-
-# TernJS port file
-.tern-port
-
-# Stores VSCode versions used for testing VSCode extensions
-.vscode-test
-
-# End of https://www.toptal.com/developers/gitignore/api/node
-
-# Created by https://www.toptal.com/developers/gitignore/api/macos
-# Edit at https://www.toptal.com/developers/gitignore?templates=macos
-
-### macOS ###
-# General
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two 
-Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-### macOS Patch ###
-# iCloud generated files
-*.icloud
-
-# End of https://www.toptal.com/developers/gitignore/api/macos
-
-# Created by https://www.toptal.com/developers/gitignore/api/windows
-# Edit at https://www.toptal.com/developers/gitignore?templates=windows
-
-### Windows ###
-# Windows thumbnail cache files
-Thumbs.db
-Thumbs.db:encryptable
-ehthumbs.db
-ehthumbs_vista.db
-
-# Dump file
-*.stackdump
-
-# Folder config file
-[Dd]esktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msix
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-# End of https://www.toptal.com/developers/gitignore/api/windows
-
-#Added by cargo
-
-/target
-Cargo.lock
-
-.pnp.*
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions
-
-*.node
diff --git a/packages/secrets/src/keyring/.npmignore b/packages/secrets/src/keyring/.npmignore
deleted file mode 100644
index ec144db2a7..0000000000
--- a/packages/secrets/src/keyring/.npmignore
+++ /dev/null
@@ -1,13 +0,0 @@
-target
-Cargo.lock
-.cargo
-.github
-npm
-.eslintrc
-.prettierignore
-rustfmt.toml
-yarn.lock
-*.node
-.yarn
-__test__
-renovate.json
diff --git a/packages/secrets/src/keyring/README.md b/packages/secrets/src/keyring/README.md
index 81fff48673..03f354feec 100644
--- a/packages/secrets/src/keyring/README.md
+++ b/packages/secrets/src/keyring/README.md
@@ -66,31 +66,31 @@ keyring is a native Node.js module for accessing and managing OS credential stor
     </tr>
     <tr>
         <td></td>
-        <td>aarch64</td>
+        <td>x86</td>
         <td>✓</td>
         <td>✓</td>
         <td>✓</td>
         <td>✓</td>
     </tr>
     <tr>
-        <td><b>Linux (musl)</b></td>
-        <td>x64</td>
+        <td></td>
+        <td>aarch64</td>
         <td>✓</td>
         <td>✓</td>
         <td>✓</td>
         <td>✓</td>
     </tr>
     <tr>
-        <td></td>
-        <td>aarch64</td>
+        <td><b>Linux (musl)</b></td>
+        <td>x64</td>
         <td>✓</td>
         <td>✓</td>
         <td>✓</td>
         <td>✓</td>
     </tr>
     <tr>
-        <td><b>zLinux</b></td>
-        <td>s390x</td>
+        <td></td>
+        <td>aarch64</td>
         <td>✓</td>
         <td>✓</td>
         <td>✓</td>
diff --git a/packages/secrets/src/keyring/napi.json b/packages/secrets/src/keyring/napi.json
index 8567cb8d9f..354e4cdc10 100644
--- a/packages/secrets/src/keyring/napi.json
+++ b/packages/secrets/src/keyring/napi.json
@@ -1,24 +1,21 @@
 {
-    "napi": {
-        "name": "keyring",
-        "package": {
-            "name": "keyring"
-        },
-        "triples": {
-            "defaults": true,
-            "additional": [
-            "x86_64-unknown-linux-musl",
-            "aarch64-unknown-linux-gnu",
-            "i686-unknown-linux-gnu",
-            "i686-pc-windows-msvc",
-            "armv7-unknown-linux-gnueabihf",
-            "aarch64-apple-darwin",
-            "aarch64-linux-android",
-            "x86_64-unknown-freebsd",
-            "aarch64-unknown-linux-musl",
-            "aarch64-pc-windows-msvc",
-            "armv7-linux-androideabi"
-            ]
-        }
+  "napi": {
+    "name": "keyring",
+    "package": {
+      "name": "keyring"
+    },
+    "triples": {
+      "defaults": true,
+      "additional": [
+        "x86_64-unknown-linux-musl",
+        "aarch64-unknown-linux-gnu",
+        "i686-unknown-linux-gnu",
+        "i686-pc-windows-msvc",
+        "armv7-unknown-linux-gnueabihf",
+        "aarch64-apple-darwin",
+        "aarch64-unknown-linux-musl",
+        "aarch64-pc-windows-msvc"
+      ]
     }
-}
\ No newline at end of file
+  }
+}
diff --git a/packages/secrets/src/keyring/src/build.rs b/packages/secrets/src/keyring/src/build.rs
deleted file mode 100644
index 9fc2367889..0000000000
--- a/packages/secrets/src/keyring/src/build.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-extern crate napi_build;
-
-fn main() {
-    napi_build::setup();
-}