diff --git a/projects/rdc/CMakeLists.txt b/projects/rdc/CMakeLists.txt
index fb93c8716c..4aa58a83dd 100755
--- a/projects/rdc/CMakeLists.txt
+++ b/projects/rdc/CMakeLists.txt
@@ -107,7 +107,6 @@ set(COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/common")
 set(GRPC_ROOT_DEFAULT "/usr")
 set(GRPC_ROOT ${GRPC_ROOT_DEFAULT} CACHE PATH "GRPC installation directory.")
 set(GRPC_DESIRED_VERSION 1.61.0 CACHE STRING "GRPC desired package version.")
-set(RDC_SHARE_INSTALL_PREFIX "share/${RDC}" CACHE INTERNAL "Tests and Example install directory")
 
 # add package search paths
 list(APPEND CMAKE_PREFIX_PATH
@@ -359,7 +358,7 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/authentication
     DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/${RDC}
     COMPONENT ${CLIENT_COMPONENT})
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/example
-    DESTINATION ${RDC_SHARE_INSTALL_PREFIX}
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${RDC}
     COMPONENT dev)
 
 #Identify between SLES and Centos for setting symlink for rdc.service
diff --git a/projects/rdc/README.md b/projects/rdc/README.md
index 7592e36880..ea98656584 100644
--- a/projects/rdc/README.md
+++ b/projects/rdc/README.md
@@ -147,9 +147,9 @@ When *rdcd* is started from a command-line the *capabilities* are determined by
 
     systemctl start rdc         ## start rdc as systemd service
 
-Additional options can be passed to *rdcd* by modifying `/opt/rocm/etc/rdc_options`
+Additional options can be passed to *rdcd* by modifying `/opt/rocm/share/rdc/conf/rdc_options.conf`
 
-    ## file: /opt/rocm/etc/rdc_options
+    ## file: /opt/rocm/share/rdc/conf/rdc_options.conf
     # Append 'rdc' daemon parameters here
     RDC_OPTS="-p 50051 -u -d"
 
diff --git a/projects/rdc/server/CMakeLists.txt b/projects/rdc/server/CMakeLists.txt
index 98c1d9630c..745865ae4f 100755
--- a/projects/rdc/server/CMakeLists.txt
+++ b/projects/rdc/server/CMakeLists.txt
@@ -74,7 +74,7 @@ message("SERVER_SRC_LIST=${SERVER_SRC_LIST}")
 set(SERVER_DAEMON_EXE "rdcd")
 set(SERVICE_FILE_NAME "rdc.service")
 configure_file("rdc.service.in" "${PROJECT_BINARY_DIR}/${SERVICE_FILE_NAME}" @ONLY)
-set(SERVER_CONFIG_FILE "rdc_options")
+set(SERVER_CONFIG_FILE "rdc_options.conf")
 configure_file("${SERVER_CONFIG_FILE}" "${PROJECT_BINARY_DIR}/${SERVER_CONFIG_FILE}" COPYONLY)
 
 link_directories(${AMD_SMI_LIB_DIR})
@@ -98,7 +98,7 @@ install(FILES ${PROJECT_BINARY_DIR}/${SERVICE_FILE_NAME}
     DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/${RDC}
     COMPONENT ${SERVER_COMPONENT})
 install(FILES ${PROJECT_BINARY_DIR}/${SERVER_CONFIG_FILE}
-    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${RDC}/conf
     COMPONENT ${SERVER_COMPONENT})
 
 message("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&")
diff --git a/projects/rdc/server/rdc.service.in b/projects/rdc/server/rdc.service.in
index 9f6a610b66..fb0a7e6df9 100755
--- a/projects/rdc/server/rdc.service.in
+++ b/projects/rdc/server/rdc.service.in
@@ -13,7 +13,7 @@ After=network.target
 #Requires=
 
 [Service]
-EnvironmentFile=-/@CPACK_PACKAGING_INSTALL_PREFIX@/@CMAKE_INSTALL_SYSCONFDIR@/rdc_options
+EnvironmentFile=-/@CPACK_PACKAGING_INSTALL_PREFIX@/@CMAKE_INSTALL_DATAROOTDIR@/@RDC@/conf/rdc_options.conf
 User=rdc
 Group=rdc
 
diff --git a/projects/rdc/server/rdc_options b/projects/rdc/server/rdc_options.conf
similarity index 100%
rename from projects/rdc/server/rdc_options
rename to projects/rdc/server/rdc_options.conf
diff --git a/projects/rdc/tests/rdc_tests/CMakeLists.txt b/projects/rdc/tests/rdc_tests/CMakeLists.txt
index 273c5f3144..a60c8a8114 100755
--- a/projects/rdc/tests/rdc_tests/CMakeLists.txt
+++ b/projects/rdc/tests/rdc_tests/CMakeLists.txt
@@ -82,9 +82,9 @@ target_link_libraries(${RDCTST}
     PUBLIC pthread)
 
 install(TARGETS ${RDCTST} gtest gtest_main
-    DESTINATION ${RDC_SHARE_INSTALL_PREFIX}/rdctst_tests
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${RDC}/rdctst_tests
     COMPONENT ${TESTS_COMPONENT})
 
 install(FILES ${RDCTST}.exclude
-    DESTINATION ${RDC_SHARE_INSTALL_PREFIX}/rdctst_tests
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${RDC}/rdctst_tests
     COMPONENT ${TESTS_COMPONENT})