diff --git a/.emv_mainnet b/.emv_mainnet
deleted file mode 100644
index bf83604..0000000
--- a/.emv_mainnet
+++ /dev/null
@@ -1,32 +0,0 @@
-INFURA_API_KEY=
-ALCHEMY_API_KEY=ZoFsby6rdZoPyzROKeh67wvxTUxtbHxZ
-PUBLIC_ADDRESS=0x35dad65F60c1A32c9895BE97f6bcE57D32792E83
-PRIVATE_KEY=
-MNEMONIC=
-NOF_DAI_CONTRACT_NAME='NofTestDAIV3'
-NOF_ALPHA_CONTRACT_NAME='NofAlphaV3'
-NOF_GAMMA_PACKS_CONTRACT_NAME='NofGammaPacksV3'
-NOF_GAMMA_CARDS_CONTRACT_NAME='NofGammaCardsV5'
-NOF_GAMMA_CARDS_NFT_CONTRACT_NAME='NofGammaCardsNFTV1'
-NOF_GAMMA_OFFERS_CONTRACT_NAME='NofGammaOffersV4'
-NOF_GAMMA_TICKETS_CONTRACT_NAME='NofGammaTicketsV1'
-NOF_GAMMA_LIB_PACK_VERIFIER_CONTRACT_NAME='LibPackVerifier'
-NOF_GAMMA_LIB_STRING_UTILS_CONTRACT_NAME='LibStringUtils'
-NOF_GAMMA_LIB_OWNERS_MGMT_CONTRACT_NAME='LibControlMgmt'
-SIGNATURE_METHOD='1'
-PRINT_LOGS_IN_TESTS='0'
-MICRO_SERVICE_SIGNATURE_WALLETS_ADDRESSES='0xbc448896fa30dcafa085c0a45005a1334ebf1ab3,0x20517cf8C140F7F393F92cEa6158f57385a75733,0x4c46a8a7cf253e2fb7afe816a4bc273fbdd46c8c,0xfc355c1731a9f4e49a2fe7f9412aa22fa8fde198,0x1836acb4f313f21cbb86ffe2e8e9dfe2d853a657,0x422db8aef9748680d13e29d3495a66254f5e9061'
-BALANCE_RECEIVER_WALLET_ADDRESS='0x6b510284C49705eA14e92aD35D86FD3075eC56e0'
-
-NOF_DAI_MINT_EXTRA_WALLET_ADDRESSES=''
-
-ADDITIONAL_OWNERS_WALLETS_ADDRESSES=''
-
-NOF_DAI_CONTRACT_CURRENT_ADDRESS=''
-NOF_ALPHA_CONTRACT_CURRENT_ADDRESS=''
-NOF_GAMMA_CARDS_CONTRACT_CURRENT_ADDRESS=''
-NOF_GAMMA_CARDS_NFT_CONTRACT_CURRENT_ADDRESS=''
-NOF_GAMMA_PACKS_CONTRACT_CURRENT_ADDRESS=''
-NOF_GAMMA_OFFERS_CONTRACT_CURRENT_ADDRESS=''
-NOF_GAMMA_TICKETS_CONTRACT_CURRENT_ADDRESS=''
-
diff --git a/README.md b/README.md
index 7227d9b..8bab022 100644
--- a/README.md
+++ b/README.md
@@ -119,8 +119,8 @@ npx hardhat test
 # Deploy to local
 npx hardhat run scripts/deploy.ts
 
-# Deploy to Mumbai 
-npx hardhat run scripts/deploy.ts --network mumbai
+# Deploy to Testnet 
+npx hardhat run scripts/deploy.ts --network amoy
 
 # Deploy Mock Data (local)
 npx hardhat run scripts/deploy-mock-data.ts
@@ -146,6 +146,14 @@ NOTA: The ERC20 token being used is DAI, the official addresses of the Mainnet a
 
 Alternatively for testnet, the source code of the DAI contract is in this repository (contracts folder) to deploy your own and avoid collecting cents from faucets.
 
+### Amoy
+* DAI: 0xd5654b986d5aDba8662c06e847E32579078561dC
+* Alpha: 0xBA5E2aF09e39CC36dfBc9530c4d4C89d5C44d323
+* Gamma Cards: 0xe6C812381DF5532A4bA4dA27baA1889adf67eec4
+* Gamma Cards NFT: 0xCcF821c87bE912984bCb952A36Fdfca066a925F8
+* Gamma Packs: 0xc616ac2191C6012791d3aBFA0e8f372579986090
+* Gamma Offers: 0x7DC00081F078D64B7b02535d82D3b6041D79Ce32
+* Gamma Tickets: 0xCD177Fa01b249Ee8ca1afF0136c06cD279E8Bf3e
 
 ### Mumbai 
 * DAI: 0xEa4c35c858E15Cef77821278A88435dE57bc8707
@@ -231,6 +239,11 @@ see more in: https://github.com/P4-Games/NoF-Smart-Contracts/graphs/contributors
 
 ### Faucets
 
+* Matic Faucet on Amoy:
+    - https://www.alchemy.com/faucets/polygon-amoy
+    - https://faucet.trade/polygon-amoy-matic-faucet
+    - https://learnweb3.io/faucets/polygon_amoy/ 
+
 * Matic Faucet on Mumbai: 
     - https://mumbaifaucet.com/
 
diff --git a/hardhat.config.ts b/hardhat.config.ts
index 013db36..443a1a3 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -39,6 +39,10 @@ const config: HardhatUserConfig = {
       url: `https://polygon-mumbai.g.alchemy.com/v2/${ALCHEMY_API_KEY}`,
       ...(PRIVATE_KEY ? { accounts: [`${PRIVATE_KEY}`] } : {})
     },
+    amoy: {
+      url: `https://polygon-amoy.g.alchemy.com/v2/${ALCHEMY_API_KEY}`,
+      ...(PRIVATE_KEY ? { accounts: [`${PRIVATE_KEY}`] } : {})
+    },
     sepolia: {
       url: `https://sepolia.infura.io/v3/${INFURA_API_KEY}`,
       ...(PRIVATE_KEY ? { accounts: [`${PRIVATE_KEY}`] } : {})
diff --git a/package.json b/package.json
index 34bce16..6588152 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "compile": "hardhat compile",
     "deploy": "npx hardhat run scripts/deploy.ts --network localhost",
     "deploy-mock-data": "npx hardhat run scripts/deploy-mock-data.ts --network localhost",
-    "deploy-mumbai": "npx hardhat run scripts/deploy.ts --network mumbai",
+    "deploy-amoy": "npx hardhat run scripts/deploy.ts --network amoy",
     "solhint": "npx solhint \"{contracts,test}/**/*.sol\"",
     "lint": "npx eslint --ignore-path .gitignore .",
     "lint:fix": "npx eslint --ignore-path .gitignore . --fix",
diff --git a/scripts/common.ts b/scripts/common.ts
index e9e61eb..fd3a20c 100644
--- a/scripts/common.ts
+++ b/scripts/common.ts
@@ -87,11 +87,6 @@ export async function deployContracts(wallets: SignerWithAddress[]) {
   const nofGammaLibStringutilsCurrentAddress = process.env.NOF_GAMMA_LIB_STRING_UTILS_CONTRACT_CURRENT_ADDRESS || ''
   const nofGammaLibControlMgmtCurrentAddress = process.env.NOF_GAMMA_LIB_OWNERS_MGMT_CONTRACT_CURRENT_ADDRESS || ''
 
-  if(nofDaiContractCurrentAddress === '' && !isLocalhost && !isHardhat) {
-    console.error('Real DAI Smart Contract Address must be filled in NOF_DAI_CONTRACT_CURRENT_ADDRESS variable in .env')
-    process.exit(1);
-  }
-
   const libPackVerifier = await deployContract(nofGammaLibPackVerifierCurrentAddress, nofGammaLibPackVerifierName)
   const libStringUtils = await deployContract(nofGammaLibStringutilsCurrentAddress, nofGammaLibStringUtilsName)
   const libControlMgmt = await deployContract(nofGammaLibControlMgmtCurrentAddress, nofGammaLibControlMgmtName)