diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35fe04095b2..8331e1e2057 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+- Add section about container image inspection to Image
+  Management chapter in Administration Guide (bsc#1236323)
 - Fixed typo in Installation and Upgrade Guide (bsc#1237403)
 - Updated host renaming in Troubleshooting section of the
   Administration Guide
diff --git a/l10n-weblate/administration.cfg b/l10n-weblate/administration.cfg
index abd546f6343..dbe1f88969c 100644
--- a/l10n-weblate/administration.cfg
+++ b/l10n-weblate/administration.cfg
@@ -26,6 +26,7 @@
 [type: asciidoc] modules/administration/pages/custom-channels.adoc $lang:translations/$lang/modules/administration/pages/custom-channels.adoc
 [type: asciidoc] modules/administration/pages/disconnected-setup.adoc $lang:translations/$lang/modules/administration/pages/disconnected-setup.adoc
 [type: asciidoc] modules/administration/pages/image-management.adoc $lang:translations/$lang/modules/administration/pages/image-management.adoc
+[type: asciidoc] modules/administration/pages/image-mgmt-container-inspection.adoc $lang:translations/$lang/modules/administration/pages/image-mgmt-container-inspection.adoc
 [type: asciidoc] modules/administration/pages/infra-maintenance.adoc $lang:translations/$lang/modules/administration/pages/infra-maintenance.adoc
 [type: asciidoc] modules/administration/pages/iss.adoc $lang:translations/$lang/modules/administration/pages/iss.adoc
 [type: asciidoc] modules/administration/pages/iss_intro.adoc $lang:translations/$lang/modules/administration/pages/iss_intro.adoc
diff --git a/modules/administration/pages/image-management.adoc b/modules/administration/pages/image-management.adoc
index 6fa9eb2284f..0d35baca2df 100644
--- a/modules/administration/pages/image-management.adoc
+++ b/modules/administration/pages/image-management.adoc
@@ -76,7 +76,10 @@ From the {productname} {webui}, perform these steps to configure a build host:
 . Install all required packages by applying [systemitem]``Highstate``.
   From the system details tab select menu:States[Highstate], and click btn:[Apply Highstate].
   Alternatively, apply [systemitem]``Highstate`` from the {productname} Server command line:
+
 +
+
+[source,shell]
 ----
 salt '$your_client' state.highstate
 ----
@@ -342,6 +345,12 @@ The status icon for the imported image can also be seen on the ``Overview`` tab
 === Troubleshooting
 
 
+
+include::image-mgmt-container-inspection.adoc[]
+
+
+==== General Issues
+
 These are some known problems when working with images:
 
 * HTTPS certificates to access the registry or the git repositories should be deployed to the client by a custom state file.
diff --git a/modules/administration/pages/image-mgmt-container-inspection.adoc b/modules/administration/pages/image-mgmt-container-inspection.adoc
new file mode 100644
index 00000000000..1d6e2ea9a59
--- /dev/null
+++ b/modules/administration/pages/image-mgmt-container-inspection.adoc
@@ -0,0 +1,16 @@
+==== Image Inspection
+
+A base container image (BCI) comes with all the software to run it, but because BCIs are lightweight they may not come with all tools and libraries you may need for inspection.
+
+When inspecting a container image you can see an error message such as:
+
+----
+libssl.so.1.1: cannot open shared object file: No such file or directory
+----
+
+A BCI can be used in the other scenarios than with the container build host and using the {salt} bundle for the inspection, but if you need inspection to work you must add all needed software in advance.
+
+To avoid such issues you must add [systemitem]``libopenssl`` to the image with [systemitem]``Dockerfile`` and rebuild the image.
+
+The same can happen with [systemitem]``libexpat``.
+