diff --git a/README.md b/README.md
index fad469f..f24aa9c 100644
--- a/README.md
+++ b/README.md
@@ -79,9 +79,14 @@
  - [REDFISH-cheatsheet.md](https://github.com/openbmc/docs/blob/master/REDFISH-cheatsheet.md): Quick reference for some common
    curl commands required for redfish testing.
  - [README.md](https://github.com/openbmc/phosphor-webui/blob/master/README.md): Web UI setup reference.
- - [Tools.md](https://github.com/openbmc/openbmc-test-automation/blob/master/docs/openbmc_test_tools.md): Reference information for helper tools.
  - [Corporate CLA and Individual CLA](https://github.com/openbmc/docs/blob/master/CONTRIBUTING.md#submitting-changes-via-gerrit-server): Submitting changes via Gerrit server
 
+## OpenBMC Test Documentation ##
+
+ - [Tools](https://github.com/openbmc/openbmc-test-automation/blob/master/docs/openbmc_test_tools.md): Reference information for helper tools.
+ - [Code Update](https://github.com/openbmc/openbmc-test-automation/blob/master/docs/code_update.md): Currently supported BMC and PNOR update.
+ - [Certificate Generate](https://github.com/openbmc/openbmc-test-automation/blob/master/docs/certificate_generate.md): Steps to create and install CA signed certificate.
+
 ## Testing Setup Steps ##
 
 To verify the installation setup is completed and ready to execute.
@@ -285,49 +290,3 @@
     ```
     $ OPENBMC_HOST=x.x.x.x tox -e default -- --argumentfile test_lists/HW_CI tests
     ```
-
-## Code Update ##
-
-Currently supported BMC and PNOR update formats are UBI and non-UBI.
-For code update information, please refer to [code-update.md](https://github.com/openbmc/docs/blob/master/code-update/code-update.md)
-
-
-* UBI Format *
-
-    For BMC code update, download the system type *.ubi.mdt.tar image from
-    https://openpower.xyz/job/openbmc-build/ and run as follows:
-
-    For Witherspoon system:
-    ```
-    $ cd extended/code_update/
-    $ robot -v OPENBMC_HOST:x.x.x.x -v IMAGE_FILE_PATH:<image path>/obmc-phosphor-image-witherspoon.ubi.mtd.tar --include REST_BMC_Code_Update  bmc_code_update.robot
-    ```
-
-    For host code update, download the system type *.pnor.squashfs.tar image
-    from https://openpower.xyz/job/openpower-op-build/ and run as follows:
-
-    For Witherspoon system:
-    ```
-    $ cd extended/code_update/
-    $ robot -v OPENBMC_HOST:x.x.x.x -v IMAGE_FILE_PATH:<image path>/witherspoon.pnor.squashfs.tar --include REST_Host_Code_Update  host_code_update.robot
-    ```
-
-* Non-UBI Format *
-
-    For BMC code update, download the system type *all.tar image from
-    https://openpower.xyz/job/openbmc-build/ and run as follows:
-
-    For a Zaius system:
-    ```
-    $ cd extended/code_update/
-    $ robot -v OPENBMC_HOST:x.x.x.x -v FILE_PATH:<image path>/zaius-<date time>.all.tar --include Initiate_Code_Update_BMC update_bmc.robot
-    ```
-
-    For host code update, download the system type *.pnor from
-    https://openpower.xyz/job/openpower-op-build/ and run as follows:
-
-    For a Zaius system:
-    ```
-    $ cd extended/
-    $ robot -v OPENBMC_HOST:x.x.x.x -v PNOR_IMAGE_PATH:<image path>/zaius.pnor test_bios_update.robot
-    ```
diff --git a/docs/code_update.md b/docs/code_update.md
new file mode 100644
index 0000000..9ed283a
--- /dev/null
+++ b/docs/code_update.md
@@ -0,0 +1,45 @@
+## Code Update ##
+
+Currently supported BMC and PNOR update formats are UBI and non-UBI.
+For code update information, please refer to [code-update.md](https://github.com/openbmc/docs/blob/master/code-update/code-update.md)
+
+
+* UBI Format *
+
+    For BMC code update, download the system type *.ubi.mdt.tar image from
+    https://openpower.xyz/job/openbmc-build/ and run as follows:
+
+    For Witherspoon system:
+    ```
+    $ cd extended/code_update/
+    $ robot -v OPENBMC_HOST:x.x.x.x -v IMAGE_FILE_PATH:<image path>/obmc-phosphor-image-witherspoon.ubi.mtd.tar --include REST_BMC_Code_Update  bmc_code_update.robot
+    ```
+
+    For host code update, download the system type *.pnor.squashfs.tar image
+    from https://openpower.xyz/job/openpower-op-build/ and run as follows:
+
+    For Witherspoon system:
+    ```
+    $ cd extended/code_update/
+    $ robot -v OPENBMC_HOST:x.x.x.x -v IMAGE_FILE_PATH:<image path>/witherspoon.pnor.squashfs.tar --include REST_Host_Code_Update  host_code_update.robot
+    ```
+
+* Non-UBI Format *
+
+    For BMC code update, download the system type *all.tar image from
+    https://openpower.xyz/job/openbmc-build/ and run as follows:
+
+    For a Zaius system:
+    ```
+    $ cd extended/code_update/
+    $ robot -v OPENBMC_HOST:x.x.x.x -v FILE_PATH:<image path>/zaius-<date time>.all.tar --include Initiate_Code_Update_BMC update_bmc.robot
+    ```
+
+    For host code update, download the system type *.pnor from
+    https://openpower.xyz/job/openpower-op-build/ and run as follows:
+
+    For a Zaius system:
+    ```
+    $ cd extended/
+    $ robot -v OPENBMC_HOST:x.x.x.x -v PNOR_IMAGE_PATH:<image path>/zaius.pnor test_bios_update.robot
+    ```