diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 539f0f33..984d58a7 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - demo
     paths-ignore:
       - 'developer-preview/**'
 
@@ -25,6 +26,14 @@ jobs:
         timeout-minutes: 10
         uses: actions/checkout@v4
 
+      - name: Get API keys
+        timeout-minutes: 10
+        shell: bash
+        run: |
+          cat << EOF | jq -r 'to_entries[] | select(.key|endswith("_API_KEY")) | "\(.key)=\(.value)"' >> "$GITHUB_ENV"
+          ${{ toJSON(secrets) }}
+          EOF
+
       - name: Setup python
         timeout-minutes: 10
         uses: actions/setup-python@v5
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 6e583617..cdd73444 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -5,11 +5,6 @@ on:
     paths-ignore:
       - 'developer-preview/**'
 
-permissions:
-  id-token: write
-  contents: read
-  pull-requests: write
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -34,6 +29,15 @@ jobs:
             registry/**/eip712-*.json
             registry/**/calldata-*.json
 
+      - name: Get API keys
+        timeout-minutes: 10
+        if: steps.changed-descriptor-files.outputs.any_changed == 'true'
+        shell: bash
+        run: |
+          cat << EOF | jq -r 'to_entries[] | select(.key|endswith("_API_KEY")) | "\(.key)=\(.value)"' >> "$GITHUB_ENV"
+          ${{ toJSON(secrets) }}
+          EOF
+
       - name: Setup python
         timeout-minutes: 10
         if: steps.changed-descriptor-files.outputs.any_changed == 'true'
@@ -42,20 +46,10 @@ jobs:
           python-version: '3.12'
           cache: 'pip'
 
-      - name: Login to Ledger JFrog
-        timeout-minutes: 10
-        if: steps.changed-descriptor-files.outputs.any_changed == 'true'
-        uses: LedgerHQ/actions-security/actions/jfrog-login@actions/jfrog-login-1
-
-      - name: Setup pip
-        timeout-minutes: 10
-        if: steps.changed-descriptor-files.outputs.any_changed == 'true'
-        run: jf pipc --global --repo-resolve=virtual-pypi-prod-green
-
       - name: Install ERC-7730 library
         timeout-minutes: 10
         if: steps.changed-descriptor-files.outputs.any_changed == 'true'
-        run: jf pip install erc7730
+        run: pip install erc7730
 
       - name: Validate ERC-7730 descriptors changed in pull request
         timeout-minutes: 10
diff --git a/ercs/eip712-erc2612-permit.json b/ercs/eip712-erc2612-permit.json
index 7e4f60e9..b566d95b 100644
--- a/ercs/eip712-erc2612-permit.json
+++ b/ercs/eip712-erc2612-permit.json
@@ -81,6 +81,10 @@
                     "spender",
                     "value"
                 ],
+                "excluded": [
+                    "owner",
+                    "nonce"
+                ],
                 "screens": {}
             }
         }
diff --git a/registry/1inch/eip712-1inch-ethereum.json b/registry/1inch/eip712-1inch-ethereum.json
index 5ade8856..4d2524bd 100644
--- a/registry/1inch/eip712-1inch-ethereum.json
+++ b/registry/1inch/eip712-1inch-ethereum.json
@@ -107,6 +107,10 @@
               "label": "To",
               "format": "raw"
             }
+          ],
+          "excluded": [
+            "salt",
+            "makerTraits"
           ]
         }
       }
diff --git a/registry/1inch/eip712-1inch-polygon-aggregation-router.json b/registry/1inch/eip712-1inch-polygon-aggregation-router.json
index 175e398f..db1e5931 100644
--- a/registry/1inch/eip712-1inch-polygon-aggregation-router.json
+++ b/registry/1inch/eip712-1inch-polygon-aggregation-router.json
@@ -107,6 +107,10 @@
               "label": "To",
               "format": "raw"
             }
+          ],
+          "excluded": [
+            "salt",
+            "makerTraits"
           ]
         }
       }
diff --git a/registry/uniswap/eip712-UniswapX-DutchOrder.json b/registry/uniswap/eip712-UniswapX-DutchOrder.json
index 77bbc2db..debec9e7 100644
--- a/registry/uniswap/eip712-UniswapX-DutchOrder.json
+++ b/registry/uniswap/eip712-UniswapX-DutchOrder.json
@@ -186,6 +186,14 @@
                             "encoding": "timestamp"
                         }
                     }
+                ],
+                "excluded": [
+                    "nonce",
+                    "witness.info",
+                    "witness.decayStartTime",
+                    "witness.decayEndTime",
+                    "witness.inputEndAmount",
+                    "witness.outputs.[].startAmount"                    
                 ]
             }
         }
diff --git a/registry/uniswap/eip712-UniswapX-ExclusiveDutchOrder.json b/registry/uniswap/eip712-UniswapX-ExclusiveDutchOrder.json
index 2daf48dc..5edac878 100644
--- a/registry/uniswap/eip712-UniswapX-ExclusiveDutchOrder.json
+++ b/registry/uniswap/eip712-UniswapX-ExclusiveDutchOrder.json
@@ -195,6 +195,16 @@
                             "encoding": "timestamp"
                         }
                     }
+                ],
+                "excluded": [
+                    "nonce",
+                    "witness.info",
+                    "witness.decayStartTime",
+                    "witness.decayEndTime",
+                    "witness.exclusiveFiller",
+                    "witness.exclusivityOverrideBps",
+                    "witness.inputEndAmount",
+                    "witness.outputs.[].startAmount"
                 ]
             }
         }
diff --git a/registry/uniswap/eip712-UniswapX-LimitOrder.json b/registry/uniswap/eip712-UniswapX-LimitOrder.json
index cd85b614..c8b985a0 100644
--- a/registry/uniswap/eip712-UniswapX-LimitOrder.json
+++ b/registry/uniswap/eip712-UniswapX-LimitOrder.json
@@ -168,6 +168,10 @@
                             "encoding": "timestamp"
                         }
                     }
+                ],
+                "excluded": [
+                    "nonce",
+                    "witness.info"
                 ]
             }
         }
diff --git a/registry/uniswap/eip712-permit2.json b/registry/uniswap/eip712-permit2.json
index d8f93c3a..8f582a6e 100644
--- a/registry/uniswap/eip712-permit2.json
+++ b/registry/uniswap/eip712-permit2.json
@@ -145,6 +145,9 @@
                     "spender",
                     "details.amount"
                 ],
+                "excluded": [
+                    "sigDeadline"
+                ],
                 "screens": {}
             },
 
@@ -183,6 +186,9 @@
                     "spender",
                     "details"
                 ],
+                "excluded": [
+                    "sigDeadline"
+                ],
                 "screens": {}
             }
         }