diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index cb38aaf16..889bd9d1b 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -89,6 +89,7 @@ body:
        - Trezor
        - Keystone
        - GridPlus Lattice1
+       - AirGap Vault
        - Other (please elaborate in the "Additional Context" section)
  - type: textarea
    id: additional
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 237a83d92..a4350f384 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -42,7 +42,7 @@
     "message": "QR-based HW Wallet"
   },
   "QRHardwareWalletSteps2Description": {
-    "message": "AirGap Vault & Ngrave (Coming Soon)"
+    "message": "Ngrave (Coming Soon)"
   },
   "about": {
     "message": "About"
@@ -191,6 +191,12 @@
   "aggregatorFeeCost": {
     "message": "Aggregator network fee"
   },
+  "airgapVault": {
+    "message": "AirGap Vault"
+  },
+  "airgapVaultTutorial": {
+    "message": " (Tutorials)"
+  },
   "alertDisableTooltip": {
     "message": "This can be changed in \"Settings > Alerts\""
   },
diff --git a/ui/pages/create-account/connect-hardware/select-hardware.js b/ui/pages/create-account/connect-hardware/select-hardware.js
index 375b33f23..be4d1326b 100644
--- a/ui/pages/create-account/connect-hardware/select-hardware.js
+++ b/ui/pages/create-account/connect-hardware/select-hardware.js
@@ -350,6 +350,30 @@ export default class SelectHardware extends Component {
           </>
         ),
       },
+      {
+        message: (
+          <>
+            <a
+              className="hw-connect__msg-link"
+              href="https://airgap.it/metamask"
+              rel="noopener noreferrer"
+              target="_blank"
+              key="airgap-vault-support-link"
+            >
+              {this.context.t('airgapVault')}
+            </a>
+            <a
+              className="hw-connect__msg-link"
+              href="https://support.airgap.it/guides/metamask"
+              rel="noopener noreferrer"
+              target="_blank"
+              key="airgap-vault-tutorial-link"
+            >
+              {this.context.t('airgapVaultTutorial')}
+            </a>
+          </>
+        ),
+      },
       {
         message: this.context.t('QRHardwareWalletSteps2Description'),
       },