diff --git a/contracts/src/upgrades/polkadot/GatewayPNA.sol b/contracts/src/upgrades/polkadot/GatewayPNA.sol
new file mode 100644
index 0000000000..730751e70c
--- /dev/null
+++ b/contracts/src/upgrades/polkadot/GatewayPNA.sol
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
+pragma solidity 0.8.25;
+
+import "../../Gateway.sol";
+import {AssetsStorage} from "../../storage/AssetsStorage.sol";
+import {TokenInfo} from "../../Types.sol";
+
+contract GatewayPNA is Gateway {
+    constructor(
+        address beefyClient,
+        address agentExecutor,
+        ParaID bridgeHubParaID,
+        bytes32 bridgeHubAgentID,
+        uint8 foreignTokenDecimals,
+        uint128 destinationMaxTransferFee
+    )
+        Gateway(
+            beefyClient,
+            agentExecutor,
+            bridgeHubParaID,
+            bridgeHubAgentID,
+            foreignTokenDecimals,
+            destinationMaxTransferFee
+        )
+    {}
+
+    function initialize(bytes memory) external override {}
+
+    function tokenInfo(address token) external view returns (TokenInfo memory) {
+        return AssetsStorage.layout().tokenRegistry[token];
+    }
+}
diff --git a/contracts/test/ForkUpgrade.t.sol b/contracts/test/ForkUpgrade.t.sol
new file mode 100644
index 0000000000..b0a325951d
--- /dev/null
+++ b/contracts/test/ForkUpgrade.t.sol
@@ -0,0 +1,77 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity 0.8.25;
+
+import {Test} from "forge-std/Test.sol";
+import {console} from "forge-std/console.sol";
+
+import {IUpgradable} from "../src/interfaces/IUpgradable.sol";
+import {IGateway} from "../src/interfaces/IGateway.sol";
+import {Gateway} from "../src/Gateway.sol";
+import {GatewayPNA} from "../src/upgrades/polkadot/GatewayPNA.sol";
+import {AgentExecutor} from "../src/AgentExecutor.sol";
+import {UpgradeParams, SetOperatingModeParams, OperatingMode, RegisterForeignTokenParams} from "../src/Params.sol";
+import {ChannelID, ParaID, OperatingMode, TokenInfo} from "../src/Types.sol";
+
+contract ForkUpgradeTest is Test {
+    address private constant GatewayProxy = 0x27ca963C279c93801941e1eB8799c23f407d68e7;
+    address private constant BeefyClient = 0x6eD05bAa904df3DE117EcFa638d4CB84e1B8A00C;
+    bytes32 private constant BridgeHubAgent = 0x03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314;
+
+    function setUp() public {
+        vm.createSelectFork("https://rpc.tenderly.co/fork/b77e07b8-ad6d-4e83-b5be-30a2001964aa", 20645700);
+        vm.allowCheatcodes(GatewayProxy);
+        vm.startPrank(GatewayProxy);
+        forkUpgrade();
+    }
+
+    function forkUpgrade() public {
+        AgentExecutor executor = new AgentExecutor();
+
+        GatewayPNA newLogic =
+            new GatewayPNA(BeefyClient, address(executor), ParaID.wrap(1002), BridgeHubAgent, 10, 20000000000);
+
+        UpgradeParams memory params =
+            UpgradeParams({impl: address(newLogic), implCodeHash: address(newLogic).codehash, initParams: bytes("")});
+
+        vm.expectEmit(true, false, false, false);
+        emit IUpgradable.Upgraded(address(newLogic));
+
+        Gateway(GatewayProxy).upgrade(abi.encode(params));
+    }
+
+    function checkLegacyToken() public {
+        TokenInfo memory weth = GatewayPNA(GatewayProxy).tokenInfo(0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2);
+        assertEq(weth.isRegistered, true);
+        assertEq(weth.foreignID, bytes32(""));
+        TokenInfo memory myth = GatewayPNA(GatewayProxy).tokenInfo(0xBA41Ddf06B7fFD89D1267b5A93BFeF2424eb2003);
+        assertEq(myth.isRegistered, true);
+        assertEq(myth.foreignID, bytes32(""));
+    }
+
+    function registerForeignToken() public {
+        bytes32 dotId = 0xa8f2ec5bdd7a07d844ee3bce83f9ba3881f495d96f07cacbeeb77d9e031db4f0;
+        RegisterForeignTokenParams memory params =
+            RegisterForeignTokenParams({foreignTokenID: dotId, name: "DOT", symbol: "DOT", decimals: 10});
+
+        vm.expectEmit(true, true, false, false);
+        emit IGateway.ForeignTokenRegistered(dotId, address(0x0));
+
+        GatewayPNA(GatewayProxy).registerForeignToken(abi.encode(params));
+        TokenInfo memory dot = GatewayPNA(GatewayProxy).tokenInfo(0x70D9d338A6b17957B16836a90192BD8CDAe0b53d);
+        assertEq(dot.isRegistered, true);
+        assertEq(dot.foreignID, dotId);
+    }
+
+    function testSanityCheck() public {
+        // Check AH channel nonces as expected
+        (uint64 inbound, uint64 outbound) = IGateway(GatewayProxy).channelNoncesOf(
+            ChannelID.wrap(0xc173fac324158e77fb5840738a1a541f633cbec8884c6a601c567d2b376a0539)
+        );
+        assertEq(inbound, 13);
+        assertEq(outbound, 172);
+        // Register PNA
+        registerForeignToken();
+        // Check legacy ethereum token not affected
+        checkLegacyToken();
+    }
+}