diff --git a/examples/sandbox/index.ts b/examples/sandbox/index.ts
index 9c0901f34..e19c78df9 100644
--- a/examples/sandbox/index.ts
+++ b/examples/sandbox/index.ts
@@ -631,23 +631,22 @@ $getXpubs.each(function () {
 
     const btcGetPublicKeysInput = [
       {
-        addressNList: [0x80000000 + 44, 0x80000000 + 0, 0x80000000 + 0],
-        curve: "secp256k1",
-        showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it
         coin: "Bitcoin",
+        addressNList: [2147483732, 2147483648, 2147483648],
+        curve: "secp256k1",
+        scriptType: core.BTCInputScriptType.SpendWitness,
       },
       {
-        addressNList: [0x80000000 + 44, 0x80000000 + 0, 0x80000000 + 1],
-        curve: "secp256k1",
-        showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it
         coin: "Bitcoin",
+        addressNList: [2147483697, 2147483648, 2147483648],
+        curve: "secp256k1",
+        scriptType: core.BTCInputScriptType.SpendP2SHWitness,
       },
       {
-        addressNList: [0x80000000 + 49, 0x80000000 + 0, 0x80000000 + 0],
-        curve: "secp256k1",
-        showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it
         coin: "Bitcoin",
-        scriptType: core.BTCInputScriptType.SpendP2SHWitness,
+        addressNList: [2147483692, 2147483648, 2147483648],
+        curve: "secp256k1",
+        scriptType: core.BTCInputScriptType.SpendAddress,
       },
     ];
     const bchGetPublicKeysInput = [
@@ -655,7 +654,8 @@ $getXpubs.each(function () {
         addressNList: [0x80000000 + 44, 0x80000000 + 145, 0x80000000 + 0],
         curve: "secp256k1",
         showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it
-        coin: "Bitcoin Cash",
+        coin: "BitcoinCash",
+        scriptType: core.BTCInputScriptType.SpendAddress,
       },
     ];
     const ltcGetPublicKeysInput = [
@@ -665,7 +665,7 @@ $getXpubs.each(function () {
         curve: "secp256k1",
         showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it
         coin: "Litecoin",
-        scriptType: "p2wpkh",
+        scriptType: core.BTCInputScriptType.SpendWitness,
       },
       // SegwitP2sh
       {
@@ -673,7 +673,7 @@ $getXpubs.each(function () {
         curve: "secp256k1",
         showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it
         coin: "Litecoin",
-        scriptType: "p2sh-p2wpkh",
+        scriptType: core.BTCInputScriptType.SpendP2SHWitness,
       },
       // P2Pksh
       {
@@ -681,7 +681,7 @@ $getXpubs.each(function () {
         curve: "secp256k1",
         showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it
         coin: "Litecoin",
-        scriptType: "p2pkh",
+        scriptType: core.BTCInputScriptType.SpendAddress,
       },
     ];
     const dogeGetPublicKeysInput = [
@@ -690,6 +690,7 @@ $getXpubs.each(function () {
         curve: "secp256k1",
         showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it
         coin: "Dogecoin",
+        scriptType: core.BTCInputScriptType.SpendAddress,
       },
     ];
     const hardenedPathGetPublicKeysInput = [
diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json
index 1eaf137f9..8ebb73a06 100644
--- a/examples/sandbox/package.json
+++ b/examples/sandbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-sandbox",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "private": true,
   "browserslist": "> 0.5%, last 2 versions, not dead",
@@ -10,21 +10,21 @@
     "clean": "rm -rf dist node_modules public .parcel-cache"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.52.3",
-    "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.3",
-    "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.3",
-    "@shapeshiftoss/hdwallet-keplr": "1.52.3",
-    "@shapeshiftoss/hdwallet-ledger": "1.52.3",
-    "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.3",
-    "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.3",
-    "@shapeshiftoss/hdwallet-metamask": "1.52.3",
-    "@shapeshiftoss/hdwallet-native": "1.52.3",
-    "@shapeshiftoss/hdwallet-portis": "1.52.3",
-    "@shapeshiftoss/hdwallet-tallyho": "1.52.3",
-    "@shapeshiftoss/hdwallet-trezor": "1.52.3",
-    "@shapeshiftoss/hdwallet-trezor-connect": "1.52.3",
-    "@shapeshiftoss/hdwallet-walletconnect": "1.52.3",
-    "@shapeshiftoss/hdwallet-xdefi": "1.52.3",
+    "@shapeshiftoss/hdwallet-core": "1.52.4",
+    "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.4",
+    "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.4",
+    "@shapeshiftoss/hdwallet-keplr": "1.52.4",
+    "@shapeshiftoss/hdwallet-ledger": "1.52.4",
+    "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.4",
+    "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.4",
+    "@shapeshiftoss/hdwallet-metamask": "1.52.4",
+    "@shapeshiftoss/hdwallet-native": "1.52.4",
+    "@shapeshiftoss/hdwallet-portis": "1.52.4",
+    "@shapeshiftoss/hdwallet-tallyho": "1.52.4",
+    "@shapeshiftoss/hdwallet-trezor": "1.52.4",
+    "@shapeshiftoss/hdwallet-trezor-connect": "1.52.4",
+    "@shapeshiftoss/hdwallet-walletconnect": "1.52.4",
+    "@shapeshiftoss/hdwallet-xdefi": "1.52.4",
     "bip32": "^2.0.4",
     "jquery": "^3.4.1",
     "json": "^9.0.6",
diff --git a/integration/package.json b/integration/package.json
index 485ea2048..18e780fa4 100644
--- a/integration/package.json
+++ b/integration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/integration",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "main": "index.js",
   "license": "MIT",
   "private": true,
@@ -10,15 +10,15 @@
     "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.52.3",
-    "@shapeshiftoss/hdwallet-keepkey": "1.52.3",
-    "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.3",
-    "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.3",
-    "@shapeshiftoss/hdwallet-ledger": "1.52.3",
-    "@shapeshiftoss/hdwallet-native": "1.52.3",
-    "@shapeshiftoss/hdwallet-portis": "1.52.3",
-    "@shapeshiftoss/hdwallet-trezor": "1.52.3",
-    "@shapeshiftoss/hdwallet-xdefi": "1.52.3",
+    "@shapeshiftoss/hdwallet-core": "1.52.4",
+    "@shapeshiftoss/hdwallet-keepkey": "1.52.4",
+    "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.4",
+    "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.4",
+    "@shapeshiftoss/hdwallet-ledger": "1.52.4",
+    "@shapeshiftoss/hdwallet-native": "1.52.4",
+    "@shapeshiftoss/hdwallet-portis": "1.52.4",
+    "@shapeshiftoss/hdwallet-trezor": "1.52.4",
+    "@shapeshiftoss/hdwallet-xdefi": "1.52.4",
     "fast-json-stable-stringify": "^2.1.0",
     "msw": "^0.27.1",
     "whatwg-fetch": "^3.6.2"
diff --git a/lerna.json b/lerna.json
index 9f9579f0c..775b6dc9a 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "lerna": "5.2.0",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "command": {
diff --git a/packages/hdwallet-coinbase/package.json b/packages/hdwallet-coinbase/package.json
index b8f1dafd4..25c520c19 100644
--- a/packages/hdwallet-coinbase/package.json
+++ b/packages/hdwallet-coinbase/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-coinbase",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@coinbase/wallet-sdk": "^3.6.6",
-    "@shapeshiftoss/hdwallet-core": "1.52.3",
+    "@shapeshiftoss/hdwallet-core": "1.52.4",
     "eth-rpc-errors": "^4.0.3",
     "lodash": "^4.17.21"
   },
diff --git a/packages/hdwallet-core/package.json b/packages/hdwallet-core/package.json
index 9bbed2772..e029713fd 100644
--- a/packages/hdwallet-core/package.json
+++ b/packages/hdwallet-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-core",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
diff --git a/packages/hdwallet-keepkey-chromeusb/package.json b/packages/hdwallet-keepkey-chromeusb/package.json
index f2fdc6b02..054eac834 100644
--- a/packages/hdwallet-keepkey-chromeusb/package.json
+++ b/packages/hdwallet-keepkey-chromeusb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-keepkey-chromeusb",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,7 +14,7 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.52.3",
-    "@shapeshiftoss/hdwallet-keepkey": "1.52.3"
+    "@shapeshiftoss/hdwallet-core": "1.52.4",
+    "@shapeshiftoss/hdwallet-keepkey": "1.52.4"
   }
 }
diff --git a/packages/hdwallet-keepkey-electron/package.json b/packages/hdwallet-keepkey-electron/package.json
index b63489f80..f262ba9f9 100644
--- a/packages/hdwallet-keepkey-electron/package.json
+++ b/packages/hdwallet-keepkey-electron/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-keepkey-electron",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,7 +14,7 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-keepkey": "1.52.3",
+    "@shapeshiftoss/hdwallet-keepkey": "1.52.4",
     "uuid": "^8.3.2"
   },
   "peerDependencies": {
diff --git a/packages/hdwallet-keepkey-nodehid/package.json b/packages/hdwallet-keepkey-nodehid/package.json
index da40891f1..591263715 100644
--- a/packages/hdwallet-keepkey-nodehid/package.json
+++ b/packages/hdwallet-keepkey-nodehid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-keepkey-nodehid",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,7 +14,7 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-keepkey": "1.52.3"
+    "@shapeshiftoss/hdwallet-keepkey": "1.52.4"
   },
   "peerDependencies": {
     "node-hid": "^2.1.1"
diff --git a/packages/hdwallet-keepkey-nodewebusb/package.json b/packages/hdwallet-keepkey-nodewebusb/package.json
index 6bf556d75..80bf14329 100644
--- a/packages/hdwallet-keepkey-nodewebusb/package.json
+++ b/packages/hdwallet-keepkey-nodewebusb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-keepkey-nodewebusb",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,8 +14,8 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.52.3",
-    "@shapeshiftoss/hdwallet-keepkey": "1.52.3"
+    "@shapeshiftoss/hdwallet-core": "1.52.4",
+    "@shapeshiftoss/hdwallet-keepkey": "1.52.4"
   },
   "peerDependencies": {
     "usb": "^2.3.1"
diff --git a/packages/hdwallet-keepkey-tcp/package.json b/packages/hdwallet-keepkey-tcp/package.json
index d4be0a5d8..33d434735 100644
--- a/packages/hdwallet-keepkey-tcp/package.json
+++ b/packages/hdwallet-keepkey-tcp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-keepkey-tcp",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,8 +14,8 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.52.3",
-    "@shapeshiftoss/hdwallet-keepkey": "1.52.3",
+    "@shapeshiftoss/hdwallet-core": "1.52.4",
+    "@shapeshiftoss/hdwallet-keepkey": "1.52.4",
     "axios": "^0.21.1"
   }
 }
diff --git a/packages/hdwallet-keepkey-webusb/package.json b/packages/hdwallet-keepkey-webusb/package.json
index c75d5a98b..1925db865 100644
--- a/packages/hdwallet-keepkey-webusb/package.json
+++ b/packages/hdwallet-keepkey-webusb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-keepkey-webusb",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,8 +14,8 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.52.3",
-    "@shapeshiftoss/hdwallet-keepkey": "1.52.3"
+    "@shapeshiftoss/hdwallet-core": "1.52.4",
+    "@shapeshiftoss/hdwallet-keepkey": "1.52.4"
   },
   "devDependencies": {
     "@types/w3c-web-usb": "^1.0.4"
diff --git a/packages/hdwallet-keepkey/package.json b/packages/hdwallet-keepkey/package.json
index e0d71737c..c33d785cf 100644
--- a/packages/hdwallet-keepkey/package.json
+++ b/packages/hdwallet-keepkey/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-keepkey",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -19,7 +19,7 @@
     "@ethereumjs/tx": "^3.3.0",
     "@keepkey/device-protocol": "^7.12.2",
     "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2",
-    "@shapeshiftoss/hdwallet-core": "1.52.3",
+    "@shapeshiftoss/hdwallet-core": "1.52.4",
     "@shapeshiftoss/proto-tx-builder": "^0.8.0",
     "bignumber.js": "^9.0.1",
     "bnb-javascript-sdk-nobroadcast": "^2.16.14",
diff --git a/packages/hdwallet-keplr/package.json b/packages/hdwallet-keplr/package.json
index 906c72fe8..17e4cce06 100644
--- a/packages/hdwallet-keplr/package.json
+++ b/packages/hdwallet-keplr/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-keplr",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@shapeshiftoss/caip": "8.15.0",
-    "@shapeshiftoss/hdwallet-core": "1.52.3",
+    "@shapeshiftoss/hdwallet-core": "1.52.4",
     "@shapeshiftoss/proto-tx-builder": "^0.8.0",
     "@shapeshiftoss/types": "3.1.3",
     "base64-js": "^1.5.1",
diff --git a/packages/hdwallet-ledger-webhid/package.json b/packages/hdwallet-ledger-webhid/package.json
index 5c4e08268..1c3dc736b 100644
--- a/packages/hdwallet-ledger-webhid/package.json
+++ b/packages/hdwallet-ledger-webhid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-ledger-webhid",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -19,8 +19,8 @@
     "@ledgerhq/hw-transport": "^6.7.0",
     "@ledgerhq/hw-transport-webhid": "^6.7.0",
     "@ledgerhq/live-common": "^21.8.2",
-    "@shapeshiftoss/hdwallet-core": "1.52.3",
-    "@shapeshiftoss/hdwallet-ledger": "1.52.3",
+    "@shapeshiftoss/hdwallet-core": "1.52.4",
+    "@shapeshiftoss/hdwallet-ledger": "1.52.4",
     "@types/w3c-web-hid": "^1.0.2"
   },
   "devDependencies": {
diff --git a/packages/hdwallet-ledger-webusb/package.json b/packages/hdwallet-ledger-webusb/package.json
index d2dc648bf..a7fc35562 100644
--- a/packages/hdwallet-ledger-webusb/package.json
+++ b/packages/hdwallet-ledger-webusb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-ledger-webusb",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -20,8 +20,8 @@
     "@ledgerhq/hw-transport-webusb": "^6.7.0",
     "@ledgerhq/live-common": "^21.8.2",
     "@ledgerhq/logs": "^6.10.1",
-    "@shapeshiftoss/hdwallet-core": "1.52.3",
-    "@shapeshiftoss/hdwallet-ledger": "1.52.3",
+    "@shapeshiftoss/hdwallet-core": "1.52.4",
+    "@shapeshiftoss/hdwallet-ledger": "1.52.4",
     "@types/w3c-web-usb": "^1.0.4",
     "p-queue": "^7.4.1"
   },
diff --git a/packages/hdwallet-ledger/package.json b/packages/hdwallet-ledger/package.json
index bdce74b92..17804e258 100644
--- a/packages/hdwallet-ledger/package.json
+++ b/packages/hdwallet-ledger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-ledger",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -18,7 +18,7 @@
     "@ethereumjs/common": "^2.4.0",
     "@ethereumjs/tx": "^3.3.0",
     "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2",
-    "@shapeshiftoss/hdwallet-core": "1.52.3",
+    "@shapeshiftoss/hdwallet-core": "1.52.4",
     "base64-js": "^1.5.1",
     "bchaddrjs": "^0.4.4",
     "bitcoinjs-message": "^2.0.0",
diff --git a/packages/hdwallet-ledger/src/bitcoin.ts b/packages/hdwallet-ledger/src/bitcoin.ts
index 73263259d..a71841a1c 100644
--- a/packages/hdwallet-ledger/src/bitcoin.ts
+++ b/packages/hdwallet-ledger/src/bitcoin.ts
@@ -72,9 +72,13 @@ export async function btcGetPublicKeys(
 
     const { payload: _xpub } = getWalletXpubResponse;
 
-    // Ledger returns LTC pubkeys in Ltub format for all scriptTypes. It *is* the correct account, but not in the format we want.
-    // We need to convert SegWit pubkeys to Mtubs, and SegWit native to zpubs.
-    const xpub = convertXpubVersion(_xpub, scriptTypeToAccountType[getPublicKey.scriptType]);
+    // Ledger returns
+    // - LTC pubkeys in Ltub format for all scriptTypes.
+    // - BTC pubkeys in xpub format for all scriptTypes
+    // - Doge pubkeys in xpub format instead of dgub
+    // They *are* the correct accounts, but not in the format we want.
+    // We need to convert SegWit pubkeys to Mtubs/ypubs, and SegWit native to zpubs, and Doge xpubs to dgubs.
+    const xpub = convertXpubVersion(_xpub, scriptTypeToAccountType[getPublicKey.scriptType], getPublicKey.coin);
 
     xpubs.push({
       xpub,
diff --git a/packages/hdwallet-ledger/src/utxoUtils.ts b/packages/hdwallet-ledger/src/utxoUtils.ts
index f46e0430a..c6fa7063f 100644
--- a/packages/hdwallet-ledger/src/utxoUtils.ts
+++ b/packages/hdwallet-ledger/src/utxoUtils.ts
@@ -172,14 +172,38 @@ enum PublicKeyType {
   Mtub = "01b26ef6",
 }
 
-const accountTypeToVersion = {
-  [UtxoAccountType.P2pkh]: Buffer.from(PublicKeyType.Ltub, "hex"), // no-op
-  [UtxoAccountType.SegwitP2sh]: Buffer.from(PublicKeyType.Mtub, "hex"), // LTub to Mtub
-  [UtxoAccountType.SegwitNative]: Buffer.from(PublicKeyType.zpub, "hex"), // Ltub to zpub
-};
+const accountTypeToVersion = (() => {
+  const Litecoin = {
+    [UtxoAccountType.P2pkh]: Buffer.from(PublicKeyType.Ltub, "hex"),
+    [UtxoAccountType.SegwitP2sh]: Buffer.from(PublicKeyType.Mtub, "hex"),
+    [UtxoAccountType.SegwitNative]: Buffer.from(PublicKeyType.zpub, "hex"),
+  };
+
+  const Dogecoin = {
+    [UtxoAccountType.P2pkh]: Buffer.from(PublicKeyType.dgub, "hex"),
+  };
+  const Bitcoin = {
+    [UtxoAccountType.P2pkh]: Buffer.from(PublicKeyType.xpub, "hex"),
+    [UtxoAccountType.SegwitP2sh]: Buffer.from(PublicKeyType.ypub, "hex"),
+    [UtxoAccountType.SegwitNative]: Buffer.from(PublicKeyType.zpub, "hex"),
+  };
 
-// We already get accounts in the format we want from Ledger - except LiteCoin SegWit/Native
-const convertVersions = ["Ltub"];
+  return (coin: string, type: UtxoAccountType) => {
+    switch (coin) {
+      case "Litecoin":
+        return Litecoin[type];
+      case "Bitcoin":
+        return Bitcoin[type];
+      case "Dogecoin":
+        if (type !== UtxoAccountType.P2pkh) throw new Error("Unsupported account type");
+        return Dogecoin[type];
+      default:
+        return Bitcoin[type]; // xpub, ypub, zpub
+    }
+  };
+})();
+// Legacy accounts should be left as-is
+const convertVersions = ["Ltub", "xpub", "dgub"];
 
 /**
  * Convert any public key into an xpub, ypub, or zpub based on account type
@@ -190,8 +214,9 @@ const convertVersions = ["Ltub"];
  * USE SPARINGLY - there aren't many cases where we should convert version bytes
  * @param {string} xpub - the public key provided by the wallet
  * @param {UtxoAccountType} accountType - The desired account type to be encoded into the public key
+ * @param {string} coin - The coin type, which will determine what version we derive
  */
-export function convertXpubVersion(xpub: string, accountType: UtxoAccountType | undefined) {
+export function convertXpubVersion(xpub: string, accountType: UtxoAccountType | undefined, coin: string) {
   if (!accountType) return xpub;
   if (!convertVersions.includes(xpub.substring(0, 4))) {
     return xpub;
@@ -199,10 +224,11 @@ export function convertXpubVersion(xpub: string, accountType: UtxoAccountType |
 
   const payload = decode(xpub);
   const version = payload.slice(0, 4);
-  if (version.compare(accountTypeToVersion[accountType]) !== 0) {
+  const desiredVersion = accountTypeToVersion(coin, accountType);
+  if (version.compare(desiredVersion) !== 0) {
     // Get the key without the version code at the front
     const key = payload.slice(4);
-    return encode(Buffer.concat([accountTypeToVersion[accountType], key]));
+    return encode(Buffer.concat([desiredVersion, key]));
   }
   return xpub;
 }
diff --git a/packages/hdwallet-metamask-shapeshift-multichain/package.json b/packages/hdwallet-metamask-shapeshift-multichain/package.json
index e70d62c8f..5382f6ba5 100644
--- a/packages/hdwallet-metamask-shapeshift-multichain/package.json
+++ b/packages/hdwallet-metamask-shapeshift-multichain/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-shapeshift-multichain",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,7 +17,7 @@
     "@metamask/detect-provider": "^1.2.0",
     "@metamask/onboarding": "^1.0.1",
     "@shapeshiftoss/common-api": "^9.3.0",
-    "@shapeshiftoss/hdwallet-core": "1.52.3",
+    "@shapeshiftoss/hdwallet-core": "1.52.4",
     "@shapeshiftoss/metamask-snaps-adapter": "^1.0.8",
     "@shapeshiftoss/metamask-snaps-types": "^1.0.8",
     "eth-rpc-errors": "^4.0.3",
diff --git a/packages/hdwallet-metamask/package.json b/packages/hdwallet-metamask/package.json
index a3c4c81b6..3f181baab 100644
--- a/packages/hdwallet-metamask/package.json
+++ b/packages/hdwallet-metamask/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-metamask",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -16,7 +16,7 @@
   "dependencies": {
     "@metamask/detect-provider": "^1.2.0",
     "@metamask/onboarding": "^1.0.1",
-    "@shapeshiftoss/hdwallet-core": "1.52.3",
+    "@shapeshiftoss/hdwallet-core": "1.52.4",
     "eth-rpc-errors": "^4.0.3",
     "lodash": "^4.17.21"
   },
diff --git a/packages/hdwallet-native-vault/package.json b/packages/hdwallet-native-vault/package.json
index e4c9f5314..f0dc8af70 100644
--- a/packages/hdwallet-native-vault/package.json
+++ b/packages/hdwallet-native-vault/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-native-vault",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,7 +14,7 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-native": "1.52.3",
+    "@shapeshiftoss/hdwallet-native": "1.52.4",
     "bip39": "^3.0.4",
     "hash-wasm": "^4.9.0",
     "idb-keyval": "^6.0.3",
diff --git a/packages/hdwallet-native/package.json b/packages/hdwallet-native/package.json
index 44655010b..6a4973ca0 100644
--- a/packages/hdwallet-native/package.json
+++ b/packages/hdwallet-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-native",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -16,7 +16,7 @@
   "dependencies": {
     "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2",
     "@shapeshiftoss/fiosdk": "1.2.1-shapeshift.6",
-    "@shapeshiftoss/hdwallet-core": "1.52.3",
+    "@shapeshiftoss/hdwallet-core": "1.52.4",
     "@shapeshiftoss/proto-tx-builder": "^0.8.0",
     "@zxing/text-encoding": "^0.9.0",
     "bchaddrjs": "^0.4.9",
diff --git a/packages/hdwallet-portis/package.json b/packages/hdwallet-portis/package.json
index 6d55d31ca..daf476efc 100644
--- a/packages/hdwallet-portis/package.json
+++ b/packages/hdwallet-portis/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-portis",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@portis/web3": "3.0.10",
-    "@shapeshiftoss/hdwallet-core": "1.52.3",
+    "@shapeshiftoss/hdwallet-core": "1.52.4",
     "base64-js": "^1.5.1",
     "bip32": "^2.0.4",
     "bitcoinjs-lib": "^5.1.6",
diff --git a/packages/hdwallet-tallyho/package.json b/packages/hdwallet-tallyho/package.json
index e688dc75b..512ec2194 100644
--- a/packages/hdwallet-tallyho/package.json
+++ b/packages/hdwallet-tallyho/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-tallyho",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,7 +14,7 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.52.3",
+    "@shapeshiftoss/hdwallet-core": "1.52.4",
     "lodash": "^4.17.21",
     "tallyho-onboarding": "^1.0.2"
   },
diff --git a/packages/hdwallet-trezor-connect/package.json b/packages/hdwallet-trezor-connect/package.json
index 8196d257c..3437dbd4b 100644
--- a/packages/hdwallet-trezor-connect/package.json
+++ b/packages/hdwallet-trezor-connect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-trezor-connect",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,8 +14,8 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.52.3",
-    "@shapeshiftoss/hdwallet-trezor": "1.52.3",
+    "@shapeshiftoss/hdwallet-core": "1.52.4",
+    "@shapeshiftoss/hdwallet-trezor": "1.52.4",
     "@trezor/rollout": "^1.2.0",
     "trezor-connect": "^8.2.1"
   }
diff --git a/packages/hdwallet-trezor/package.json b/packages/hdwallet-trezor/package.json
index 795a537a5..c09bacb6a 100644
--- a/packages/hdwallet-trezor/package.json
+++ b/packages/hdwallet-trezor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-trezor",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,7 +17,7 @@
   "dependencies": {
     "@ethereumjs/common": "^2.4.0",
     "@ethereumjs/tx": "^3.3.0",
-    "@shapeshiftoss/hdwallet-core": "1.52.3",
+    "@shapeshiftoss/hdwallet-core": "1.52.4",
     "base64-js": "^1.5.1",
     "lodash": "^4.17.21"
   },
diff --git a/packages/hdwallet-walletconnect/package.json b/packages/hdwallet-walletconnect/package.json
index 8101de3f3..d53919558 100644
--- a/packages/hdwallet-walletconnect/package.json
+++ b/packages/hdwallet-walletconnect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-walletconnect",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -15,7 +15,7 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.52.3",
+    "@shapeshiftoss/hdwallet-core": "1.52.4",
     "@walletconnect/qrcode-modal": "^1.7.8",
     "@walletconnect/web3-provider": "^1.7.8",
     "ethers": "^5.6.5"
diff --git a/packages/hdwallet-walletconnectV2/package.json b/packages/hdwallet-walletconnectV2/package.json
index ff4681cca..44d72ea45 100644
--- a/packages/hdwallet-walletconnectV2/package.json
+++ b/packages/hdwallet-walletconnectV2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-walletconnectv2",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -15,7 +15,7 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.52.3",
+    "@shapeshiftoss/hdwallet-core": "1.52.4",
     "@walletconnect/ethereum-provider": "^2.10.1",
     "@walletconnect/modal": "^2.6.2",
     "ethers": "^5.6.5"
diff --git a/packages/hdwallet-xdefi/package.json b/packages/hdwallet-xdefi/package.json
index 1d2c43eb9..aaa1ca359 100644
--- a/packages/hdwallet-xdefi/package.json
+++ b/packages/hdwallet-xdefi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-xdefi",
-  "version": "1.52.3",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,7 +14,7 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.52.3",
+    "@shapeshiftoss/hdwallet-core": "1.52.4",
     "lodash": "^4.17.21"
   },
   "devDependencies": {