diff --git a/SOURCES/Containerfile.5.md b/SOURCES/Containerfile.5.md
index 48374c7..49720c5 100644
--- a/SOURCES/Containerfile.5.md
+++ b/SOURCES/Containerfile.5.md
@@ -49,7 +49,7 @@ A Containerfile is similar to a Makefile.
   to a new image if necessary, before finally outputting the ID of the new
   image.
 
-  Container engines re-use intermediate images whenever possible. This significantly
+  Container engines reuse intermediate images whenever possible. This significantly
   accelerates the *build* process.
 
 # FORMAT
diff --git a/SOURCES/shortnames.conf b/SOURCES/shortnames.conf
index 3500b2d..13cfac9 100644
--- a/SOURCES/shortnames.conf
+++ b/SOURCES/shortnames.conf
@@ -22,6 +22,8 @@
   # Fedora
   "fedora-minimal" = "registry.fedoraproject.org/fedora-minimal"
   "fedora" = "registry.fedoraproject.org/fedora"
+  # Gentoo
+  "gentoo" = "docker.io/gentoo/stage3"
   # openSUSE
   "opensuse/tumbleweed" = "registry.opensuse.org/opensuse/tumbleweed"
   "opensuse/tumbleweed-dnf" = "registry.opensuse.org/opensuse/tumbleweed-dnf"
@@ -54,10 +56,10 @@
   "rhel7" = "registry.access.redhat.com/rhel7"
   "rhel7.9" = "registry.access.redhat.com/rhel7.9"
   "rhel-atomic" = "registry.access.redhat.com/rhel-atomic"
-  "rhel-minimal" = "registry.access.redhat.com/rhel-minimum"
+  "rhel-minimal" = "registry.access.redhat.com/rhel-minimal"
   "rhel-init" = "registry.access.redhat.com/rhel-init"
   "rhel7-atomic" = "registry.access.redhat.com/rhel7-atomic"
-  "rhel7-minimal" = "registry.access.redhat.com/rhel7-minimum"
+  "rhel7-minimal" = "registry.access.redhat.com/rhel7-minimal"
   "rhel7-init" = "registry.access.redhat.com/rhel7-init"
   "rhel7/rhel" = "registry.access.redhat.com/rhel7/rhel"
   "rhel7/rhel-atomic" = "registry.access.redhat.com/rhel7/rhel7/rhel-atomic"
@@ -121,3 +123,12 @@
   "rust" = "docker.io/library/rust"
   # node
   "node" = "docker.io/library/node"
+  # Grafana Labs
+  "grafana/agent" = "docker.io/grafana/agent"
+  "grafana/grafana" = "docker.io/grafana/grafana"
+  "grafana/k6" = "docker.io/grafana/k6"
+  "grafana/loki" = "docker.io/grafana/loki"
+  "grafana/mimir" = "docker.io/grafana/mimir"
+  "grafana/oncall" = "docker.io/grafana/oncall"
+  "grafana/pyroscope" = "docker.io/grafana/pyroscope"
+  "grafana/tempo" = "docker.io/grafana/tempo"
diff --git a/SPECS/containers-common.spec b/SPECS/containers-common.spec
index 7b253a6..8c1a1e8 100644
--- a/SPECS/containers-common.spec
+++ b/SPECS/containers-common.spec
@@ -12,7 +12,7 @@
 Epoch: 2
 Name: containers-common
 Version: 1
-Release: 70%{?dist}
+Release: 71%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
 # arch limitation because of go-md2man (missing on i686)
@@ -175,6 +175,10 @@ EOF
 %{_datadir}/rhel/secrets/*
 
 %changelog
+* Fri Jan 19 2024 Jindrich Novy <jnovy@redhat.com> - 2:1-71
+- update vendored components and configuration files
+- Resolves: RHEL-20910
+
 * Mon Oct 09 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-70
 - bump version to preserve upgrade path
 - Resolves: Jira:RHEL-12277