diff --git a/README.md b/README.md
index 6a921d9ad..941e096c4 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ Please see the [ErgoDEX](https://github.com/ergolabs/ergo-dex) repository for a
 2. `yarn`
 3. `yarn start`
 4. Open localhost:3000 in Chrome.
-5. Install [Yoroi Nightly](https://chrome.google.com/webstore/detail/yoroi-nightly/poonlenmfdfbjfeeballhiibknlknepo?hl=en&authuser=0) and [Yoroi-dapp-connector Nightly](https://chrome.google.com/webstore/detail/yoroi-ergo-dapp-connector/chifollcalpmjdiokipacefnpmbgjnle/related?hl=en&authuser=0)
+5. Install [Yoroi Wallet](https://chrome.google.com/webstore/detail/yoroi/ffnbelfdoeiohenkjibnmadjiehjhajb)
 
 <!-- ROADMAP -->
 ## Roadmap
diff --git a/src/common/constants/env.ts b/src/common/constants/env.ts
index c96bb1215..780367e4f 100644
--- a/src/common/constants/env.ts
+++ b/src/common/constants/env.ts
@@ -4,7 +4,7 @@ export const FEEDBACK_FORM_URL = 'https://forms.gle/F7nqXhdx1EBEFR4F7';
 
 export const LANDING_URL = 'https://ergodex.io';
 
-export const YOROI_NIGHTLY_LINK =
-  'https://chrome.google.com/webstore/detail/yoroi-nightly/poonlenmfdfbjfeeballhiibknlknepo';
+export const YOROI_LINK =
+  'https://chrome.google.com/webstore/detail/yoroi/ffnbelfdoeiohenkjibnmadjiehjhajb';
 export const YOROI_WALLET_LINK =
   'https://chrome.google.com/webstore/detail/yoroi/ffnbelfdoeiohenkjibnmadjiehjhajb';
diff --git a/src/components/ConfirmationModal/ConfirmationModal.tsx b/src/components/ConfirmationModal/ConfirmationModal.tsx
index ab66a3145..0e9767a8a 100644
--- a/src/components/ConfirmationModal/ConfirmationModal.tsx
+++ b/src/components/ConfirmationModal/ConfirmationModal.tsx
@@ -133,7 +133,7 @@ const YoroiIssueModalContent = () => (
     </Flex.Item>
     <Flex.Item marginBottom={1}>
       <Typography.Body align="center">
-        Seems like Yoroi Nightly has an issue
+        Seems like Yoroi Wallet has an issue
       </Typography.Body>
     </Flex.Item>
     <Flex.Item marginBottom={1}>
diff --git a/src/components/common/ConnectWalletButton/ChooseWalletModal/ChooseWalletModal.tsx b/src/components/common/ConnectWalletButton/ChooseWalletModal/ChooseWalletModal.tsx
index 9b0bd04e9..b830ac00a 100644
--- a/src/components/common/ConnectWalletButton/ChooseWalletModal/ChooseWalletModal.tsx
+++ b/src/components/common/ConnectWalletButton/ChooseWalletModal/ChooseWalletModal.tsx
@@ -73,15 +73,15 @@ const ChooseWalletModal: React.FC<ChooseWalletModalProps> = ({
 
   const wallets = [
     {
-      name: 'Yoroi Nightly',
+      name: 'Yoroi Wallet',
       logo: <YoroiLogo />,
       onClick: () => {
         return connectYoroiWallet(walletCtx)().then((res) => {
           connectWallet();
           notification.info({
-            message: 'Yoroi Nightly tip',
+            message: 'Yoroi Wallet tip',
             description:
-              'Keep Yoroi Nightly extension window open, when you use ErgoDEX. So that it will sync faster.',
+              'Keep Yoroi Wallet extension window open, when you use ErgoDEX. So that it will sync faster.',
             duration: null,
           });
           return res;
diff --git a/src/utils/wallets/yoroi.tsx b/src/utils/wallets/yoroi.tsx
index c95f98a3c..b2bc6fae4 100644
--- a/src/utils/wallets/yoroi.tsx
+++ b/src/utils/wallets/yoroi.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { applicationConfig } from '../../applicationConfig';
-import { YOROI_NIGHTLY_LINK } from '../../common/constants/env';
+import { YOROI_LINK } from '../../common/constants/env';
 import { WalletContextType } from '../../context';
 import { Typography } from '../../ergodex-cdk';
 import { walletCookies } from '../cookies';
@@ -12,8 +12,8 @@ export const connectYoroiWallet =
       return Promise.reject(
         <>
           To use ErgoDEX install{' '}
-          <Typography.Link href={YOROI_NIGHTLY_LINK} target="_blank">
-            Yoroi Nightly
+          <Typography.Link href={YOROI_LINK} target="_blank">
+            Yoroi Wallet
           </Typography.Link>{' '}
           .
         </>,