diff --git a/doc/source/system_configuration/kubernetes/change-the-registry-url.rst b/doc/source/system_configuration/kubernetes/change-the-registry-url.rst
index 625ff9962..f6df20f41 100644
--- a/doc/source/system_configuration/kubernetes/change-the-registry-url.rst
+++ b/doc/source/system_configuration/kubernetes/change-the-registry-url.rst
@@ -14,7 +14,7 @@ registries' URLs using the following command:
     NEW_URL_START=new-registry.domain.com:9001
     for registry in docker-registry quay-registry elastic-registry gcr-registry k8s-registry icr-registry ghcr-registry registryk8s-registry
     do
-    uuid=`system service-parameter-list |grep $registry | grep url | awk '{print $2}'`
+    uuid=`system service-parameter-list |grep -w $registry | grep url | awk '{print $2}'`
     url_path=`system service-parameter-show $uuid | grep value | awk '{print $4}' | cut -d '/' -f 2-`
     system service-parameter-modify docker $registry url=$NEW_URL_START/$url_path
     done
diff --git a/doc/source/system_configuration/kubernetes/create-the-registry-secrets.rst b/doc/source/system_configuration/kubernetes/create-the-registry-secrets.rst
index c89cf8bd8..96c56b940 100644
--- a/doc/source/system_configuration/kubernetes/create-the-registry-secrets.rst
+++ b/doc/source/system_configuration/kubernetes/create-the-registry-secrets.rst
@@ -20,7 +20,7 @@ To create the auth-secrets for the new registries, use the following command:
     for registry in docker-registry quay-registry elastic-registry gcr-registry k8s-registry icr-registry ghcr-registry registryk8s-registry
     do
     openstack secret store -n ${registry}-secret -p "${NEW_USERNAME_PASSWORD}"
-    secret_uuid=`openstack secret list |grep ${registry}-secret | awk '{print $2}' | awk -F/ '{print $6}'`
+    secret_uuid=`openstack secret list |grep -w ${registry}-secret | awk '{print $2}' | awk -F/ '{print $6}'`
     system service-parameter-add docker  ${registry} auth-secret=${secret_uuid}
     done
 
diff --git a/doc/source/system_configuration/kubernetes/update-the-registry-secrets.rst b/doc/source/system_configuration/kubernetes/update-the-registry-secrets.rst
index d4d3ae608..e41720ddf 100644
--- a/doc/source/system_configuration/kubernetes/update-the-registry-secrets.rst
+++ b/doc/source/system_configuration/kubernetes/update-the-registry-secrets.rst
@@ -23,7 +23,7 @@ To update the auth-secrets for the new registries, use the following command:
     secret=`openstack secret list | grep ${registry}-secret | awk '{print $2}'`
     openstack secret delete ${secret}
     openstack secret store -n ${registry}-secret -p "${NEW_USERNAME_PASSWORD}"
-    secret_uuid=`openstack secret list |grep ${registry}-secret | awk '{print $2}' | awk -F/ '{print $6}'`
+    secret_uuid=`openstack secret list |grep -w ${registry}-secret | awk '{print $2}' | awk -F/ '{print $6}'`
     system service-parameter-modify docker  ${registry} auth-secret=${secret_uuid}
     done
 
diff --git a/doc/source/system_configuration/kubernetes/validate-existing-registry-and-new-url.rst b/doc/source/system_configuration/kubernetes/validate-existing-registry-and-new-url.rst
index ecd98d0f8..bf546aa99 100644
--- a/doc/source/system_configuration/kubernetes/validate-existing-registry-and-new-url.rst
+++ b/doc/source/system_configuration/kubernetes/validate-existing-registry-and-new-url.rst
@@ -12,7 +12,7 @@ To display the updated URLs, use the following command:
 
     for registry in docker-registry quay-registry elastic-registry gcr-registry k8s-registry icr-registry ghcr-registry registryk8s-registry
     do
-    uuid=`system service-parameter-list |grep $registry | grep url | awk '{print $2}'`
+    uuid=`system service-parameter-list |grep -w $registry | grep url | awk '{print $2}'`
     url_path=`system service-parameter-show $uuid | grep value | awk '{print $4}'`
     echo $registry URL is $url_path
     done
diff --git a/doc/source/system_configuration/kubernetes/verify-the-registry-secret-changes-and-secret-key-in-system-database.rst b/doc/source/system_configuration/kubernetes/verify-the-registry-secret-changes-and-secret-key-in-system-database.rst
index ea1ede659..a667aac64 100644
--- a/doc/source/system_configuration/kubernetes/verify-the-registry-secret-changes-and-secret-key-in-system-database.rst
+++ b/doc/source/system_configuration/kubernetes/verify-the-registry-secret-changes-and-secret-key-in-system-database.rst
@@ -12,7 +12,7 @@ To verify the registries' secret configuration changes, use the following comman
     for registry in docker-registry quay-registry elastic-registry gcr-registry k8s-registry icr-registry ghcr-registry registryk8s-registry
     do
     echo $registry
-    secret_uuid=`openstack secret list |grep ${registry}-secret | awk '{print $2}'`
+    secret_uuid=`openstack secret list |grep -w ${registry}-secret | awk '{print $2}'`
     openstack secret get -d $secret_uuid
     done
 
@@ -103,9 +103,9 @@ registry entries in the service parameter table, use the following command:
     for registry in docker-registry quay-registry elastic-registry gcr-registry k8s-registry icr-registry ghcr-registry
     do
     echo $registry
-    uuid=`system service-parameter-list |grep  $registry | grep auth-secret | awk '{print $2}'`
+    uuid=`system service-parameter-list |grep -w $registry | grep auth-secret | awk '{print $2}'`
     url=`system service-parameter-show ${uuid} | grep value | awk '{print $4}'`
-    secret_uuid=`openstack secret list |grep ${registry}-secret | awk '{print $2}'| awk -F/ '{print $6}'`
+    secret_uuid=`openstack secret list |grep -w ${registry}-secret | awk '{print $2}'| awk -F/ '{print $6}'`
     echo $url $secret_uuid
     if [ "${url}" != "${secret_uuid}" ]; then
     echo "**** ${registry} not correct"