diff --git a/.env.ci b/.env.ci
index 9003024..0b9e369 100644
--- a/.env.ci
+++ b/.env.ci
@@ -22,7 +22,8 @@ VC_DURATION=5# In minutes
 VERIFICATION_LINK=http://localhost:3000/verify
 
 # Email settings
-EMAIL_SERVICE=gmail
+EMAIL_HOST=smtp.gmail.com
+EMAIL_PORT=587
 EMAIL_USER=user@gmail.com
 EMAIL_PASSWORD=password
 
diff --git a/.env.vault b/.env.vault
index a1ee3da..70b9e4f 100644
--- a/.env.vault
+++ b/.env.vault
@@ -4,20 +4,20 @@
 #/--------------------------------------------------/
 
 # ci
-DOTENV_VAULT_CI="NI3UL+h69klFLHQOB3W8HPquTOqR/YrcLXWaLXxoIzgU2CEJMqr7wnhi4Ridct+BGFkOh6vw6RpI0jiEnXXr8UVMYSEv3coLTU494UeDvQl619oDM87LFnDtyNuhQtS8G5wO7denKYIduZMCBl8ugM2M133eB425uyomk4jowalSDMgGHHB6D2/u8AnSZdKIG1qC9HgXM/P7H9/B58ldSMKnkKA6fNY+rSe/w1mFamfeejcFRDJmlMe57AJ2il83JJZxdRvn4K6wKAI9RUgWwT4byKmimIjvTkw9STKMz9d2WMmgBaKyEg9rvZ1BWGsN2qtqXxL71yUuHODqDlC5De6k2VGhTY61c/8iFQRx7Vo3SPaW94apB2TnRjNiDBEHL03ZRQRUbXS76tZfD4ot/wwQapcXC9S1YBqmRf9zoMnwmevp6FbUjdOYcVc9Fq5IHYbKPAPfHb9q9tGWjLeHqN0xRGXcIHvZPH+21kzHT9lwdWYJ/c1+nUR+7macYhROSh67qKZu08Aj0KdTdYN4HrahZ0JMClmJCbxExWv07SoKsuUtJ6d4T85kibXh2hlHAOPAyOt2Qiji/YNN83uTAHlUfYw90dLJOOwpMTJ5+AD582Vz1q0WLK9ifJkVMjvo4fQAJOBHA5pJxtlJirylVrwOKGMEnJ0hAJulzz8INMtE1fwUf19/YEY9eIiMXe9iFE76EOKjNC65tB7bNIAXNEbsxZZQUxk8qdMp1CPHYByuxHYoXLzZOPoQQzNOuknqR4MF3DkMQO3D+TN5varC1Zb5Ocs5LgS66MF7TuiweJptKe2AtbwOz37jtc6eswRLYNQnvs5/ywY/AXiVDw6XOGz+Q/SQ5SSVqspKf+8YJsuKnuNHKlCxS5sGr3KPDRqFL9jjTZl1bhrIkOnjN4JOjTrN/UT7bXumkWXQC0wfSJUIqrzTEdL8Eg+lNP8siAw="
-DOTENV_VAULT_CI_VERSION=14
+DOTENV_VAULT_CI="7x9t4uD4mLE07O6osI7uyHKjHMTjh8KIjG/X/Bsv+ZxCY5At8jj8spMVqp4RB2Gv/5MC8wLW9dB+fLym6hmcJwQZZ4gxAx7YFMrs+8t3G1No7uVMOvw/xARjolf16+jVEFw+Dz5qu+HFkmsuJ/AGKwE1LZX6DF9hSR2RnCsZauc6eV9KxkDRk/T++e9kToXddmRsSE+Zd9izeFKwMMOvudiS8CGMf2fIx9X9fzmS38yh8w0H/kbZpMYWBG/z/TlvTMD7u5nz1C3Oi0g729mnWMRbr46FTSf6SZrG4N4WVEX6xSHwYDEHJGpp8ncb7BQd5n/Es3pNERmyaXF3v6AtDWJQaWpQSU+9yO7wecuHcrLBkzmZzX9Du5NaCgGNxcV9yYoqWyK4QsszrWW78ENGwdQn/PpVFovZPkx218EYkK8RlKoTGeByBD0TbdAh/4/xeaIAgjCCto83XGKX4pIP4tTS74Etr9+7e2DRS3A3D1vjfdV58qmke18NjO5HoBxVVXmaUG6japMBhbivvg5ndRNYaIv3QKiDguXEyiJqWYCYch0UKl+zydPiI5tIxTm6gY38smsjGUhIwcSY32s762sMaVQEFcGzORFJfGsqgXn6CvwsTp4yyyBoJyI7S+aDruBMIUheYymJaSmRd1x0lZxuLrBjcHIXr33sO55ZWMG3Kp5IyrT7JZmDnOM3SZI1EfmtYbiypZ1b4LTRro+7jS7VvU/CwX4T3uFA+T1MSsnhJAQZrhsd6pLO8lt+VtXRdvA1TafLBqYA7K77oOW2U7RU7zw1Ty1KUyoM8W/CxH1Jd27EdQPDJMZIu8FEHFlEaEunNz4YKbxSWjKSojXwIfd4kryjYvbIoPfDid8dk/qM2nGMhObB7WWZzb2HFOoVgocad4KR9Qz1K1QZKRP+pbk1xoLLl86R813tK13Pvb/E3yafdiMlOyPBXGOSxHsoWc8EY/A1ukgiZPHiDDAWEiTy0OJl"
+DOTENV_VAULT_CI_VERSION=16
 
 # development
-DOTENV_VAULT_DEVELOPMENT="QaHEDGLcl13Kycqbd9dODrwM8aSXKdFlNtF/IQepxJsfYX/HlEWsiE2LwEkPZL7WMfTYWQknlvZZWtCImjh4BA9L2wdLNPxjd9+vamM7rknbt9ThV1vDwG4A98qUYOndIZB583zTNZwRvcdCevYtc9wE0AGuHiTVAylUQzJitfK8oQyNpnJt989TUWi7+bH7khd61KCIAN23RE6uu0K8H7px5ZhaXyrISeeGJbX1cYu0VPJ957zRI/bvy6KynMXZMKDgGyTHnxLY8Hezq0ruu6UXUlEhj998X1mtbOP24P5PlI394ArCw8PXgPy4O9EVkhNOcTbau1D5fgB64Ag3+JOYoUCvorHLy7ScX+ur7OrrOrJJUHDw/Zu65ZhfuWQhbE8QtmxfpBY7TN41UEHSFCElHHtbAVxdc7H1gxJb9PIo7j916UUShLJi/A3ByFv2R/QI4rDqZXDpyf30zf2VR5LeWiruvRulOMm+NOnSGRj5MKh+vM0yLDrmIB4lRjw3NiMSfHEho6ikMOaeFhnYYjb6BremWQ28LXAu5qcknf0wdeRvuwAqcJr5GjaxS+5DMHAwwsTIz609TsyoS85XAkdgNX77UfJmkty1a9ZRFNEWigCdIv0N1CMVT2SRrLO5j55m+d7Lb8QZmrIbG8Z0L6ZBY0BlbDj0DeMds8yC9A5iEQj6apyzCytgJqURt9rQXDt7q0TfFXYKQQRC/4KNnFUZeQqMhB6Xceka95WoWyd9oCMc7MTJ5ghxYlDLLPmSEa/B+iP+m8Kqs+3gQr9qV7Vhz/cZec/DYmX7bfQil6fXRi/mpZwWCTpKSfRkkv176Mjnpff6/vYH6YzeYozrBbRxeck7pv+/g5I0HHydXRYmcmce693YqJiCwJPfewem+IWpecMyk1aNdWVJXlL3Dd6+/U8r+0b/0tJ2ZPlhTEitYT5z1Aupax19gurQTiWrLSY31Wb5wsodTw=="
-DOTENV_VAULT_DEVELOPMENT_VERSION=8
+DOTENV_VAULT_DEVELOPMENT="+x0WWROAPysZBCPTFcn5frmo7H3aEWpqlCCqZR+RJnit7i0UvbSj5GMOHPDxl9cq9eLRY5VsiQ8YYHHjqbucf5rSv7ROMpXHfv+hTaQK58UuPqY0utL3OlSHyuDJOkLjZjB5/iM0vv/IwAwWbZorAEzXBtIhK06jfNCFGaUup560lKWKX33ecktU3x6EXUZGtjNpbk3/5/9JSw2Us/NsNJy+wxYB5DvH8BBY278eoQM2qhiVSEMq7BFJ0kfDNdGAUS21vtTc+NJSGzVmI210BqiM56higj2w6Mxhk2WljZ7K6IjZi57PWt6ffwVWry52zAr/qLIHOrLUt7iF4XzuVnrrufYXWCMipS4yPm5DVnGxMc9pHK7Wu6DnmSTlPCB6SYx4YbF8A5kYTFcGLEhsMK9GZLLKGwGgDwohNuXjNoUcmnVOIoe8pzZGt7u3ZesQYA3iUqqEYrQX12nT3J7LwLw6kVajLNRsS0qdJXd867mXLxjtC3G8c/4q2bNKE0j++IvRSRTEFr3MV5LYfi8ZvowF786lw7DzuwHJggraNRFgiAZ9gq3xHfUyzqRk5mxSKZ1+PWDCQPHXDa7+LJnaUUUuRA2yeLVLWXK8Fr9tEiX693fHkgPOS96CuC8c0ZAauY5PoHLEpM2rBVyNxGBE7OzwY/CqkJJciUyjKKfiAkaPGWESFvs4nbLCDumHxpzrUJx7uaQbyEzEQQvJlbT+lmUV8WPUFDv0IuXyTdtE28luqDI2bW3ME04PDqa/ituQhUIdIjdoWTF8cM9wAngvLoFfolU5xIRFwrSMawk7GDDJOZIuMMo/8whpkpsPiJ7BG2lyKHcmr2VrsioBRnV/DdLpmg+2swEAOCeJEtVwyLaNXQ6ZDide+zE69z/MQEpyCqJ9d1O/P7XfgkfxZtsnQaZNecu330WP2/eexwj/m/3ymiOWyG3Bmn6gF2163lFD/7+NR2jEa1VKoyNAtcsdqKxR7ZuE/NuAW38K6TVP6Tw="
+DOTENV_VAULT_DEVELOPMENT_VERSION=9
 
 # staging
-DOTENV_VAULT_STAGING="ibJZ+7dDPLvdqFBco/V0GzzA/H7fr75yp3D5UXJURospWDSx0y/qhbiQLQbjTShe4icwBUVJKrfE8WU3VSqfDXfG7p++/fyPAWRaukOFSm9KDrF490pgdoOr9F4C/wTgCxgyyPuaE1mLm9M6Zl/Yba5GpOovte9jJ03/G9s/EPKbzTNBZ6/txSTUBVEKoCZokQjuIdBF+o/HsFKKTJgvKk2L0mPSsg3vumr8tfetUBEXCK3LLFYsdy50r/zm11OKqGb3TH0Ngl+ECgxZROsSFf8ehq2lglbOe/IzSzqZjNg5rLnvHx0/B71A5+uyad6tDM95U7/gXvz4duNAnuCsxb2bQHDdR10dDd0ik8t17P3UQfhLR736OEds549G+Ld/2RiBGLWWRgYUGXsonsqOaii2DehlowJaeTTTkCTzGj4W7eCmBcWcbOFhZrCpvazbUEvglGY3dPsuuZV0uZ7wPvxIsVOLBOxE0YkhmsCyaVMVzLGbl7EW0+ZyuunWDrQo9seDIZ/cPTcwdOXvzQYbtdqg3b7G6oVn02SUTl4QG2/ofwcVkQ=="
-DOTENV_VAULT_STAGING_VERSION=7
+DOTENV_VAULT_STAGING="4c4EQcGVp5DzmvSnPYYGxaE5dMJ4nCdjBaZjuOuaodlctmv9gvKjKb8Ds2BcaKEry8s/Oj4sy/eVC3RCz5LwHhBZ3Y/s3EePkId6oBy/ikubDVG5YoG3g2NZ0AApelfz9TgD8pIirt0pt7F+r8YroIhjvpwqTZlBPlsX+uVnBRjKDrGJ3SMlLmcyw/2r1vz4kpTFaVox5i0NbsD6/Kiqo3k4ZawhcUthnNTtxMjZQoL1AY6xz6dphZqg7Iy1za/WXgwgmADgbiCTLBlYDg+IzG0y1AFntQ/F1IQ+i7KUaZ2KP6q8qdIn2nBoHH3JmkxzmagZxT0UHGlXukdLFut2VU3G3slB2KQbOJET78eRzI5PJmqO8hVJ/bUpM7tdeV+j/UPCVWLtSYFG2l+4KZMQ5RjIDlRsBN3lzLCPERw0GMWPjdjmZgXLOSybKHfvhc87tIuCnNH5S5gjyEUGE/246s12dHU21JNdrvrZvRgXm0HOXuClzCQWiPFNlmO/j+Ag5hoGl/e2JNHyjW1mhCt65kqICV098Pj0viUaatNys0YbubPugqN+WytqkY2i0j7/9zmvEYZx9W1yeV2YGrb3qkc="
+DOTENV_VAULT_STAGING_VERSION=8
 
 # production
-DOTENV_VAULT_PRODUCTION="rK0/5WTxyLYtf8G7Of6qpAvbRHfvMYD5d+nJaZLgHIod5dFDzcTTmna/EaXOz9vIaEZ28PzeUEVE0iYfnJ6hOV1olyrYrUlbQrM3nejbxgw752mkejFtnkHiLnqMBSgmBAFUV5U/Ai6hF41R9mDlMxrtiIUdvjHIDsL3ptB1UA2FLjFbYPjABDFNqvUj3RRS/Gj4leETMtENk7LBoQzuWt/scwOJDW7z0QHZpjfLqwbFpviEbYb91/F4JTxegKfG2ld9UBjCuHpAzfm2W/gTxpWGcsrEuGGTLMObuKmNyrydDddAl0NlERjyvkxprbdub0B3eJdIkKRVbPO2Oa5tOq+4Sr0yvnoYoQcqzWJwuMogOgG3KXSoZmmpOZQQImpFbVDLHN6uFK4TPUnKEW3PxKBcaUXt38wdweopHgJ8AHipA6GTDgxOWCAZliFFgmwTjFD1I/OAw6RNTK/79Ike2NB2hn2Pg8qBAhfWghwG/SGUQj66n92aAtOWT2vnPTOgRD77Gu9VIplMIWrQWsLW/n6324YEUomc1S7g4ekUefX1AS1+izcDx4Y0u1b3mnIplh/xbhgUfmnZMnxSyGaEdHVhbvs9anZ51qX0aeuZGlvVDPmxd7plPZe8VwYPg+CGhNGL0dfdhN/DPPyCu/mNo7aLgxs1tfQHXY7QKJC+tOaCfLAki5NeZySrh/dgeQ6nk31yK6qZS7oQ3SCjyU7NkC7PD9GSCISZyjDd3aoy1n4QjQYvCRWzcunO9eLw/nADUOyIj5VN4ayx9iuWGyR3BqiAMRZffsdkkedvQTJpNtxU9ZuCBgtCzCqrDI5AOp1G9fNQ8qVv76dLkYGVEUhgkPMtEAGd8pjueNXdbbw317EbGncBD/c5sCY7I0SuxlYNEsH69RFYN30dWgMkK4dO+qQ4j7IsMw2xTDK7tYg8uEKAv7p21s36Kktgsb6Ybf2kPIzrgqc8nhsVzlRX7eL2dM+/sTggCIxizZ++BJJxrXPmL4VGcqK3HaZzCalvsGLwuftxnqmjRcI2NvR8n/k5bfDrRwnsAo2nD2VAEQ=="
-DOTENV_VAULT_PRODUCTION_VERSION=13
+DOTENV_VAULT_PRODUCTION="scUfz1WBvUwEWCL5+Sdkw07hiq6LuA/N+xcTsvmN5xFpJmTy6AJlTfOFrKt5ohHSI2IUEZ1j16KCVRoscfmqCfX9FBk4pz3gTc7yNNWZQ3inC96T6nh4vhV6utylnSNl1tCnh4YuCgGxYV5oYgPcHpurftAnRNwDAnCqAnnkQWcV+NMIILXnQg7kCtHm1ZmEFJTufFcmE4Yram+o/Kzy+tau/KZO6l5Ynqtxo0HM24LUyp8OIxYzU9dNPqpXSKPY0YrroAqJWS+5iYmW0TSBarYDUKhrf4jwgeJU//rZA+mVAqUWjha7GwVsv8zxiQBe5bbZjsG68aDnOpeCH9B8Q+Ls8+qRilbmK+G7KcZO3I6lhr3XOKwetWCZJPwQLSn2KaO0CP29FlSG+7pE23xIVxr3NiXRI5pbmmOedS8Kb0txT0VVe7c6p7C84UfwTtd3GFAx9WQGuakeVCKpSyXY3Am8OC1TCL2naeKRvXW7/5gStEzMHXQQrpMp/25XhxflC1tcPaiVjyw0ifDRquoEep18oIIvo5UkoDqk+EzC6gH2cSdAJtoEKSIS7e1W6hX5SFpyjatJ4Jgl9oXEQ1DIO2hUwDioClVEYw+vTfOcZJHV5nP/SVdK6hPfTBU9yimsB/WtbmfRZCOV9UcbNsFYUAQg6dnovgk7xXST1zAgo3rYibRcuna9A3MV+686ZxRTzAza2b0V7tVUX/xLT/TFIGBxDKJqqH2/A+QUxRIeKU8UPIxIyXgwfG/EUf0dN3n0cx716o3cu+798auevCUTQ0FY9nuE+wvNTGo+OAgSV1dQo24O87STXjaJhZSl4PLArhwcMD+JDfBYu/8/bKZJTJ/CrToqQWy6ILw0pn4Xb+KZsvw4KI3OmLiy8MnsClVGYVKSaKnbxBVMlhmF4gi7k+KGWZFqgExIFAch5CHzNcJVmUa45loBSVgS9Ta6wSqcwEO1OaR3q8wOUiW4EVfP2+ZOf9XwpKDjT7uF+J9LAU7mIqUkn94qBV+dDsP/Gy4rdltZOYyjQG9mpYCET8WTddDPeRKz+q88EKuFGON8rTaN1lR8k4Ztxmpb9eCDyyFA7cc="
+DOTENV_VAULT_PRODUCTION_VERSION=15
 
 #/----------------settings/metadata-----------------/
 DOTENV_VAULT="vlt_1cce7b29c7892f42e27ac6ab472faa96e16f086bcb3b48308ee1053e7d448bf8"
diff --git a/src/services/email.service.ts b/src/services/email.service.ts
index 6ee0604..5bb2213 100644
--- a/src/services/email.service.ts
+++ b/src/services/email.service.ts
@@ -13,10 +13,11 @@ export class EmailService{
     async sendConfirmationEmail(email: string, code: string): Promise<void>{
         const emailUser = this.configService.get("EMAIL_USER");
         const emailPassword = this.configService.get("EMAIL_PASSWORD");
-        // const emailService = this.configService.get("EMAIL_SERVICE");
+        const emailHost = this.configService.get("EMAIL_HOST");
+        const emailPort = this.configService.get<number>("EMAIL_PORT");
         const transporter = nodemailer.createTransport({
-            host: "smtp.gmail.com",
-            port: 587,
+            host: emailHost,
+            port: emailPort,
             auth: {
                 user: emailUser,
                 pass: emailPassword,