diff --git a/tripleo_ansible/roles/tripleo_image_serve/templates/image-serve.conf.j2 b/tripleo_ansible/roles/tripleo_image_serve/templates/image-serve.conf.j2
index 45af37c22..45c04401b 100644
--- a/tripleo_ansible/roles/tripleo_image_serve/templates/image-serve.conf.j2
+++ b/tripleo_ansible/roles/tripleo_image_serve/templates/image-serve.conf.j2
@@ -22,6 +22,25 @@ Listen {{ tripleo_container_registry_port }}
         Header set Docker-Distribution-Api-Version registry/2.0
     </Directory>
 
+    # LP#1953198 / rhbz#2026654
+    <LocationMatch "^/v2/.*/.*/manifests/(?!sha256:).*$">
+        Options FollowSymLinks
+        AllowOverride None
+        AddHandler type-map .type-map
+        RewriteEngine On
+        ReWriteCond %{REQUEST_URI} !(\.json|\.type-map)$
+        RewriteRule ^(.*) $1.type-map [PT,L]
+    </LocationMatch>
+
+    <LocationMatch "^/v2/.*/manifests/(?!sha256:).*$">
+        Options FollowSymLinks
+        AllowOverride None
+        AddHandler type-map .type-map
+        RewriteEngine On
+        ReWriteCond %{REQUEST_URI} !(\.json|\.type-map)$
+        RewriteRule ^(.*) $1.type-map [PT,L]
+    </LocationMatch>
+
     <LocationMatch "^/v2/.*/.*/blobs/sha256:.*$">
         SetEnvIf Request_URI "sha256:(.*)$" digest=sha256:$1
         Header set Docker-Content-Digest "%{digest}e"