diff --git a/docs/documentation/platform/pki/certificates/certificates.mdx b/docs/documentation/platform/pki/certificates/certificates.mdx
index b27e50145..5b37e6a19 100644
--- a/docs/documentation/platform/pki/certificates/certificates.mdx
+++ b/docs/documentation/platform/pki/certificates/certificates.mdx
@@ -68,16 +68,16 @@ In the following steps, we explore how to revoke a X.509 certificate and obtain
     selecting the **Revoke Certificate** option for it and specifying the reason
     for revocation.
 
-    ![pki revoke certificate](/images/platform/pki/cert-revoke.png)
+    ![pki revoke certificate](/images/platform/pki/certificate/cert-revoke.png)
 
-    ![pki revoke certificate modal](/images/platform/pki/cert-revoke-modal.png)
+    ![pki revoke certificate modal](/images/platform/pki/certificate/cert-revoke-modal.png)
 
   </Step>
   <Step title="Obtaining a CRL">
     In order to check the revocation status of a certificate, you can check it
     against the CRL of a CA by heading to its Issuing CA and downloading the CRL.
 
-    ![pki view crl](/images/platform/pki/ca-crl.png)
+    ![pki view crl](/images/platform/pki/ca/ca-crl.png)
 
     To verify a certificate against the
     downloaded CRL with OpenSSL, you can use the following command:
diff --git a/docs/documentation/platform/pki/enrollment-methods/api.mdx b/docs/documentation/platform/pki/enrollment-methods/api.mdx
index 7522887e2..4395c50e5 100644
--- a/docs/documentation/platform/pki/enrollment-methods/api.mdx
+++ b/docs/documentation/platform/pki/enrollment-methods/api.mdx
@@ -29,15 +29,17 @@ In the following steps, we explore how to issue a X.509 certificate using the AP
   <Step title="Issue a certificate">
   To create a certificate, head to your Project > Certificates > Certificates and press **Issue**.
   
-  TODO: Image
+  ![pki certificates](/images/platform/pki/certificate/cert-issue.png)
 
 Here, select the certificate profile from step 1 that will be used to issue the certificate and fill out the rest of the details for the certificate to be issued.
 
+![pki certificate issue modal](/images/platform/pki/certificate/cert-issue-modal.png)
+
   </Step>
   <Step title="Download the certificate details">
   Once you have created the certificate from step 1, you'll be presented with the certificate details including the **Certificate Body**, **Certificate Chain**, and **Private Key**.
   
-  TODO: Image
+  ![pki certificate body](/images/platform/pki/certificate/cert-body.png)
 
     <Note>
       Make sure to download and store the **Private Key** in a secure location as it
diff --git a/docs/images/platform/pki/ca-crl.png b/docs/images/platform/pki/ca-crl.png
deleted file mode 100644
index efe7d3b4a..000000000
Binary files a/docs/images/platform/pki/ca-crl.png and /dev/null differ
diff --git a/docs/images/platform/pki/ca/ca-crl.png b/docs/images/platform/pki/ca/ca-crl.png
new file mode 100644
index 000000000..961297409
Binary files /dev/null and b/docs/images/platform/pki/ca/ca-crl.png differ
diff --git a/docs/images/platform/pki/cert-revoke-modal.png b/docs/images/platform/pki/cert-revoke-modal.png
deleted file mode 100644
index 07bc7fce8..000000000
Binary files a/docs/images/platform/pki/cert-revoke-modal.png and /dev/null differ
diff --git a/docs/images/platform/pki/cert-revoke.png b/docs/images/platform/pki/cert-revoke.png
deleted file mode 100644
index ff7fcc597..000000000
Binary files a/docs/images/platform/pki/cert-revoke.png and /dev/null differ
diff --git a/docs/images/platform/pki/certificate/cert-body.png b/docs/images/platform/pki/certificate/cert-body.png
index 8c1433b54..02c61840a 100644
Binary files a/docs/images/platform/pki/certificate/cert-body.png and b/docs/images/platform/pki/certificate/cert-body.png differ
diff --git a/docs/images/platform/pki/certificate/cert-issue-modal.png b/docs/images/platform/pki/certificate/cert-issue-modal.png
index 352c4979c..e3de549bb 100644
Binary files a/docs/images/platform/pki/certificate/cert-issue-modal.png and b/docs/images/platform/pki/certificate/cert-issue-modal.png differ
diff --git a/docs/images/platform/pki/certificate/cert-issue.png b/docs/images/platform/pki/certificate/cert-issue.png
index 614271d19..4506b9552 100644
Binary files a/docs/images/platform/pki/certificate/cert-issue.png and b/docs/images/platform/pki/certificate/cert-issue.png differ
diff --git a/docs/images/platform/pki/certificate/cert-revoke-modal.png b/docs/images/platform/pki/certificate/cert-revoke-modal.png
new file mode 100644
index 000000000..5b47dc7ca
Binary files /dev/null and b/docs/images/platform/pki/certificate/cert-revoke-modal.png differ
diff --git a/docs/images/platform/pki/certificate/cert-revoke.png b/docs/images/platform/pki/certificate/cert-revoke.png
new file mode 100644
index 000000000..bc6bdb47c
Binary files /dev/null and b/docs/images/platform/pki/certificate/cert-revoke.png differ