diff --git a/.github/workflows/swap.yml b/.github/workflows/swap.yml
new file mode 100644
index 000000000..7dd44c6c4
--- /dev/null
+++ b/.github/workflows/swap.yml
@@ -0,0 +1,18 @@
+name: Swap feature tests
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+    - main
+  pull_request:
+
+jobs:
+  job_functional_tests:
+    uses: spalmer25/app-exchange/.github/workflows/reusable_swap_functional_tests.yml@palmer/functori/add-new-tezos-app-swap-tests
+    with:
+      repo_for_exchange: 'spalmer25/app-exchange'
+      branch_for_exchange: 'palmer/functori/add-new-tezos-app-swap-tests'
+      branch_for_tezos: ${{ github.ref }}
+      run_for_devices: '["nanos", "nanosp", "nanox"]'
+      test_filter: '"tezos_new"'
\ No newline at end of file
diff --git a/app/Makefile b/app/Makefile
index 8d6dbbc8a..e9a611c54 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -38,7 +38,7 @@ endif
 #        Mandatory configuration       #
 ########################################
 # Application name
-APPNAME = "Tezos Wallet"
+APPNAME = "New Tezos Wallet"
 
 # Application version
 APPVERSION_M=2
@@ -144,6 +144,7 @@ CFLAGS   += -Wwrite-strings
 ########################################
 ENABLE_BLUETOOTH = 1
 #ENABLE_NFC = 1
+ENABLE_SWAP = 1
 
 ########################################
 #         NBGL custom features         #