diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 56098b9c..effb470a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,7 +1,13 @@
-* @koomie @coleramos425
+* @coleramos425 @feizheng10 @dgaliffiAMD
 
 # Documentation files
 docs/ @ROCm/rocm-documentation
 *.md @ROCm/rocm-documentation
 *.rst @ROCm/rocm-documentation
 .readthedocs.yaml @ROCm/rocm-documentation
+
+# Packaging
+cmake/ @koomie
+tests/ @koomie
+CMakeLists.txt @koomie
+utils/ @koomie
\ No newline at end of file
diff --git a/docs/install/grafana-setup.rst b/docs/install/grafana-setup.rst
index a7486d28..39dca6e8 100644
--- a/docs/install/grafana-setup.rst
+++ b/docs/install/grafana-setup.rst
@@ -79,6 +79,13 @@ directory to begin.
    $ sudo docker-compose build
    $ sudo docker-compose up -d
 
+.. note::
+
+   To troubleshoot Docker container build failures related to certificate verification, try 
+   disabling any network proxy services on the host system. These proxy services can interfere 
+   with OpenSSL's ability to retrieve a correct certificate chain when the container accesses 
+   external websites.
+
 The TCP ports for Grafana (``4000``) and MongoDB (``27017``) in the Docker
 container are mapped to ``14000`` and ``27018``, respectively, on the host side.