diff --git a/content/admin/_index.md b/content/admin/_index.md
index d9700062a5..6f688bc3eb 100644
--- a/content/admin/_index.md
+++ b/content/admin/_index.md
@@ -18,7 +18,7 @@ grid:
 
 The [Docker Admin](https://admin.docker.com) console provides administrators with centralized observability, access management, and controls for their company and organizations. To provide these features, Docker uses the following hierarchy and roles.
 
-![Docker hierarchy](./images/docker-hierarchy-company.svg)
+![Docker hierarchy](./images/docker-admin-structure.png)
 
 - Company: A company simplifies the management of Docker organizations and settings. Creating a company is optional and only available to Docker Business subscribers.
   - Company owner: A company can have multiple owners. Company owners have company-wide observability and can manage company-wide settings that apply to all associated organizations. In addition, company owners have the same access as organization owners for all associated organizations.
diff --git a/content/admin/images/docker-admin-structure.png b/content/admin/images/docker-admin-structure.png
new file mode 100644
index 0000000000..b3edd68180
Binary files /dev/null and b/content/admin/images/docker-admin-structure.png differ
diff --git a/content/admin/images/org-structure.png b/content/admin/images/org-structure.png
new file mode 100644
index 0000000000..c0e52e8907
Binary files /dev/null and b/content/admin/images/org-structure.png differ
diff --git a/content/docker-hub/images/group-mapping.png b/content/docker-hub/images/group-mapping.png
new file mode 100644
index 0000000000..5da45819d9
Binary files /dev/null and b/content/docker-hub/images/group-mapping.png differ
diff --git a/content/includes/admin-company-overview.md b/content/includes/admin-company-overview.md
index 74dfc31223..0daf0d9546 100644
--- a/content/includes/admin-company-overview.md
+++ b/content/includes/admin-company-overview.md
@@ -2,7 +2,7 @@ A company provides a single point of visibility across multiple organizations. T
 
 The following diagram depicts the setup of a company and how it relates to associated organizations.
 
-![company-hierarchy](/admin/images/docker-hierarchy-company.svg)
+![company-hierarchy](/admin/images/docker-admin-structure.png)
 
 ## Key features
 
diff --git a/content/includes/admin-org-overview.md b/content/includes/admin-org-overview.md
index 7fd61ff439..665108c978 100644
--- a/content/includes/admin-org-overview.md
+++ b/content/includes/admin-org-overview.md
@@ -11,4 +11,4 @@ organization.
 
 The following diagram depicts the setup of an organization and how it relates to teams. Teams are an optional feature that owners can use to group members and assign permissions.
 
-![organization-hierarchy](/admin/images/docker-hierarchy-org.svg)
\ No newline at end of file
+![organization-hierarchy](/admin/images/org-structure.png)
\ No newline at end of file
diff --git a/content/single-sign-on/images/SSO.png b/content/single-sign-on/images/SSO.png
new file mode 100644
index 0000000000..ea6f44f2c1
Binary files /dev/null and b/content/single-sign-on/images/SSO.png differ
diff --git a/layouts/shortcodes/admin-group-mapping.html b/layouts/shortcodes/admin-group-mapping.html
index d487e3b1f7..adb6c56364 100644
--- a/layouts/shortcodes/admin-group-mapping.html
+++ b/layouts/shortcodes/admin-group-mapping.html
@@ -29,7 +29,7 @@ After every successful SSO sign-in authentication, the JIT provisioner performs
 
    b) If the IdP didn't provide group mappings, it checks if the user is already a member of the organization, or if the SSO connection is for multiple organizations (only at company level) and if the user is a member of any of those organizations. If the user is not a member, it adds the user to the default team and organization configured in the SSO connection.
 
-![JIT provisioning](/docker-hub/images/jit.PNG)
+![JIT provisioning](/docker-hub/images/group-mapping.png)
 
 ## Use group mapping
 
diff --git a/layouts/shortcodes/admin-sso.md b/layouts/shortcodes/admin-sso.md
index eb840cec73..a69287e4e9 100644
--- a/layouts/shortcodes/admin-sso.md
+++ b/layouts/shortcodes/admin-sso.md
@@ -17,7 +17,7 @@ When SSO is enabled, users are redirected to your IdP's authentication page to s
 
 The following diagram shows how SSO operates and is managed in Docker Hub and Docker Desktop. In addition, it provides information on how to authenticate between your IdP.
 
-![SSO architecture](/single-sign-on/images/sso-architecture.png)
+![SSO architecture](/single-sign-on/images/SSO.png)
 
 ## How to set it up