diff --git a/docs/documentation/guides/migrating-from-envkey.mdx b/docs/documentation/guides/migrating-from-envkey.mdx
index 3c24c69cd..e1d75bab0 100644
--- a/docs/documentation/guides/migrating-from-envkey.mdx
+++ b/docs/documentation/guides/migrating-from-envkey.mdx
@@ -12,11 +12,29 @@ Infisical is used by 10,000+ organizations across all industries including First
## Migrating from EnvKey
-To facilitate customer transition from EnvKey to Infisical, we have been working closely with the EnvKey team to provide a simple migration path for all EnvKey customers.
+
+
+Open the EnvKey dashboard and go to My Org.
+
+
+
+Go to Import/Export on the top right corner, Click on Export Org and save the exported file.
+
+
+
+Click on copy to copy the encryption key and save it.
+
+
+
+Open the Infisical dashboard and go to Organization Settings > Import.
+
+
+
+Upload the exported file from EnvKey, paste the encryption key and click Import.
+
+
+
-## Automated migration
-
-Our team is currently working on creating an automated migration process that would include secrets, policies, and other important resources. If you are interested in that, please [reach out to our team](mailto:support@infisical.com) with any questions.
## Talk to our team
diff --git a/docs/images/guides/import-envkey/copy-encryption-key.png b/docs/images/guides/import-envkey/copy-encryption-key.png
new file mode 100644
index 000000000..df0c7b459
Binary files /dev/null and b/docs/images/guides/import-envkey/copy-encryption-key.png differ
diff --git a/docs/images/guides/import-envkey/envkey-dashboard.png b/docs/images/guides/import-envkey/envkey-dashboard.png
new file mode 100644
index 000000000..0170e00fb
Binary files /dev/null and b/docs/images/guides/import-envkey/envkey-dashboard.png differ
diff --git a/docs/images/guides/import-envkey/envkey-export.png b/docs/images/guides/import-envkey/envkey-export.png
new file mode 100644
index 000000000..68d55ed14
Binary files /dev/null and b/docs/images/guides/import-envkey/envkey-export.png differ
diff --git a/docs/images/guides/import-envkey/infisical-import-dashboard.png b/docs/images/guides/import-envkey/infisical-import-dashboard.png
new file mode 100644
index 000000000..ab197f126
Binary files /dev/null and b/docs/images/guides/import-envkey/infisical-import-dashboard.png differ
diff --git a/docs/images/guides/import-envkey/infisical-import-envkey.png b/docs/images/guides/import-envkey/infisical-import-envkey.png
new file mode 100644
index 000000000..c504c9824
Binary files /dev/null and b/docs/images/guides/import-envkey/infisical-import-envkey.png differ
diff --git a/frontend/src/views/Settings/OrgSettingsPage/components/ImportTab/ImportTab.tsx b/frontend/src/views/Settings/OrgSettingsPage/components/ImportTab/ImportTab.tsx
index 86af16d44..b6dae5128 100644
--- a/frontend/src/views/Settings/OrgSettingsPage/components/ImportTab/ImportTab.tsx
+++ b/frontend/src/views/Settings/OrgSettingsPage/components/ImportTab/ImportTab.tsx
@@ -1,6 +1,7 @@
import { useEffect, useRef } from "react";
import { Controller, useForm } from "react-hook-form";
-import { faUpload } from "@fortawesome/free-solid-svg-icons";
+import Link from "next/link";
+import { faArrowUpRightFromSquare, faBookOpen, faUpload } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { zodResolver } from "@hookform/resolvers/zod";
import { z } from "zod";
@@ -23,8 +24,8 @@ type TForm = z.infer;
export const ImportTab = () => {
const fileUploadRef = useRef(null);
-const { mutateAsync: importEnvKey
-} = useImportEnvKey();
+ const { mutateAsync: importEnvKey
+ } = useImportEnvKey();
const {
handleSubmit,
@@ -46,7 +47,7 @@ const { mutateAsync: importEnvKey
file: undefined
}
});
-
+
const parseJson = (src: ArrayBuffer) => {
console.log("here")
const file = src.toString();
@@ -99,7 +100,7 @@ const { mutateAsync: importEnvKey
});
return;
}
-
+
const res = await importEnvKey({ encryptedJson: data.encryptedJson, decryptionKey: data.decryptionKey });
if (res.success) {
createNotification({
@@ -132,7 +133,21 @@ const { mutateAsync: importEnvKey
Import data from another secret manager to Infisical.
- Import from EnvKey
+