diff --git a/.gitignore b/.gitignore
index c23e727..1d6f8c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 # env variable file
 .env
 # node modules
-node_modules
\ No newline at end of file
+node_modules
+
+yarn.lock
diff --git a/README.md b/README.md
index 260b253..b24a8be 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ Deployed URL -> [https://talent.awsug.in/](https://talent.awsug.in/)
 <br>
 Backend Code -> [https://github.com/CodeOpsTechnologies/Talent-Board-Backend](https://github.com/CodeOpsTechnologies/Talent-Board-Backend)
 <br>
-API Docs -> [http://reskill-documentaion.s3-website-ap-southeast-1.amazonaws.com/#api-AWS_UG_Talent_Board](http://reskill-documentaion.s3-website-ap-southeast-1.amazonaws.com/#api-AWS_UG_Talent_Board)
+API Docs -> [http://talentboard-api-documentation.s3-website-ap-southeast-1.amazonaws.com/](http://talentboard-api-documentation.s3-website-ap-southeast-1.amazonaws.com/)
 
 ## Contributors / Credits 
 
diff --git a/package.json b/package.json
index bb40657..fb4c1d1 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
     "@tippyjs/react": "^4.2.5",
     "axios": "^0.21.1",
     "bootstrap": "^5.0.0",
+    "date-fns": "^2.22.1",
     "formik": "^2.2.7",
     "moment": "^2.29.1",
     "react": "^17.0.2",
diff --git a/src/Pages/SubmissionForm.js b/src/Pages/SubmissionForm.js
index 990db7f..4d779b5 100644
--- a/src/Pages/SubmissionForm.js
+++ b/src/Pages/SubmissionForm.js
@@ -14,10 +14,10 @@ import {
 } from "../Helpers/constants";
 import _ from "lodash";
 import SuccessModal from "./SuccessModal";
-import moment from "moment";
 import Tippy from "@tippyjs/react";
 import "tippy.js/dist/tippy.css";
 import { toast } from "react-toastify";
+import { add, formatISO } from 'date-fns';
 toast.configure();
 
 const SubmissionForm = () => {
@@ -244,33 +244,29 @@ const SubmissionForm = () => {
     switch (profileExpiresIn) {
       case 1:
         expiresAfter = String(
-          moment(new Date()).add("15", "days")._d.toISOString()
-        ).slice(0, 10);
-        break;
+          formatISO(add(new Date(), { days: 15 }), { representation: "date" })
+          )
+          break;
       case 2:
         expiresAfter = String(
-          moment(new Date()).add("30", "days")._d.toISOString()
-        ).slice(0, 10);
+           formatISO(add(new Date(), { days: 30 }), { representation: "date" }))
         break;
       case 3:
         expiresAfter = String(
-          moment(new Date()).add("45", "days")._d.toISOString()
-        ).slice(0, 10);
+           formatISO(add(new Date(), { days: 45 }), { representation: "date" })
+        )
         break;
       case 4:
         expiresAfter = String(
-          moment(new Date()).add("60", "days")._d.toISOString()
-        ).slice(0, 10);
+           formatISO(add(new Date(), { days: 60 }), { representation: "date" }))
         break;
       case 5:
         expiresAfter = String(
-          moment(new Date()).add("90", "days")._d.toISOString()
-        ).slice(0, 10);
+           formatISO(add(new Date(), { days: 90 }), { representation: "date" }))
         break;
       default:
         expiresAfter = String(
-          moment(new Date()).add("30", "days")._d.toISOString()
-        ).slice(0, 10);
+           formatISO(add(new Date(), { days: 30 }), { representation: "date" }))
     }
 
     if (!finalValidate()) return;