diff --git a/skopeo.spec b/skopeo.spec
index 337334f..527b6ff 100644
--- a/skopeo.spec
+++ b/skopeo.spec
@@ -30,7 +30,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 Epoch: 1
 Name: skopeo
 Version: 1.4.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Inspect container images and repositories on registries
 License: ASL 2.0
 URL: %{git0}
@@ -267,6 +267,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_datadir}/%{name}/test
 
 %changelog
+* Wed Aug 04 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-5
+- don't define short-name-mode in RHEL8
+- Related: #1970747
+
 * Wed Aug 04 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-4
 - put both RHEL8 and RHEL9 conditional configurations into update.sh
 - Related: #1970747
diff --git a/update.sh b/update.sh
index fb9c5d8..de439ec 100755
--- a/update.sh
+++ b/update.sh
@@ -27,7 +27,6 @@ ensure containers.conf events_logger                 \"file\"
 if pwd | grep rhel-8 > /dev/null
 then
 ensure registries.conf unqualified-search-registries [\"registry.fedoraproject.org\",\ \"registry.access.redhat.com\",\ \"registry.centos.org\",\ \"docker.io\"]
-ensure registries.conf short-name-mode               \"disabled\"
 ensure containers.conf infra_image                   \"registry.access.redhat.com/ubi8/pause\"
 ensure containers.conf runtime                       \"runc\"
 else