diff --git a/resources/docker.rst b/resources/docker.rst
index 98c38ef..075c245 100644
--- a/resources/docker.rst
+++ b/resources/docker.rst
@@ -12,22 +12,22 @@
      - Description
    * - `Search=voltha* <https://hub.docker.com/search?q=voltha>`_
      - All Docker images with prefix='voltha'
-   * - `bbsim <:vol-docker:'bbsim'>`_
+   * - :vol-docker:`bbsim`
      - BroadBand Simulator (BBSim) is a tool to simulate a PON network with OLTs, ONUs and RGs.
-   * - `bbsim-sadis-server <:vol-docker:'bbsim-sadis-server'>`_
+   * - :vol-docker:`bbsim-sadis-server`
      - BBSim Sadis Server.
        Designed to aggregate Sadis entries from multiple BBSim instances running on the same kubernetes cluster.
-   * - `voltha-rw-core <:vol-docker:'voltha-rw-core'>`_
+   * - :vol-docker:`voltha-rw-core`
      - Voltha Core
-   * - `voltha-openolt-adapter <:vol-docker:'voltha-openolt-adapter'>`_
+   * - :vol-docker:`voltha-openolt-adapter`
      - Open OLT adapter
-   * - `voltha-openonu-adapter-go <:vol-docker:'voltha-openonu-adapter-go'>`_
+   * - :vol-docker:`voltha-openonu-adapter-go`
      - Open ONU adapter
-   * - `voltha-ci-tools <:vol-docker:'voltha-ci-tools'>`_
+   * - :vol-docker:`voltha-ci-tools`
      - Versioned containers for running CI process on VOLTHA codebase
-   * - `voltha-cli <:vol-docker:'voltha-cli'>`_
+   * - :vol-docker:`voltha-cli`
      - Provides SSH access to the VOLTHA CLI
-   * - `voltha-ofagent-go <:vol-docker:'voltha-ofagent-go'>`_
+   * - :vol-docker:`voltha-ofagent-go`
      - OpenFlow management interface for Voltha
-   * - `voltha-onos <:vol-docker:'voltha-onos'>`_
+   * - :vol-docker:`voltha-onos`
      - Provides a version of ONOS with the required VOLTHA control plane applications installed
diff --git a/resources/repositories.rst b/resources/repositories.rst
index a11eeb4..af39832 100644
--- a/resources/repositories.rst
+++ b/resources/repositories.rst
@@ -10,57 +10,55 @@
    * - GERRIT Repository
      - GIT Repository
      - Description
-   * - `bbsim gerrit <:vol-ger:'bbsim'>`_
-     - `bbsim git <:vol-git:'bbsim'>`_
+   * - :vol-ger:`bbsim gerrit<bbsim>`
+     - :vol-git:`bbsim git<bbsim>`
      - BroadBand Simulator (BBSim) is a tool to simulate a PON network with OLTs, ONUs and RGs.
-   * - `bbsim-sadis-server gerrit <:vol-ger:'bbsim-sadis-server'>`_
-     - `bbsim-sadis-server git <:vol-git:'bbsim-sadis-server'>`_
+   * - :vol-ger:`bbsim-sadis-server gerrit<bbsim-sadis-server>`
+     - :vol-git:`bbsim-sadis-server git<bbsim-sadis-server>`
      - BBSim Sadis Server.
        Designed to aggregate Sadis entries from multiple BBSim instances running on the same kubernetes cluster.
-   * - `voltha-core gerrit <:vol-ger:'voltha-go'>`_
-     - `voltha-core git <:vol-git:'voltha-go'>`_
+   * - :vol-ger:`voltha-core gerrit<voltha-go>`
+     - :vol-git:`voltha-core git<voltha-go>`
      - Voltha Core
-   * - `voltha-openolt-adapter gerrit <:vol-ger:'voltha-openolt-adapter'>`_
-     - `voltha-openolt-adapter git <:vol-git:'voltha-openolt-adapter'>`_
+   * - :vol-ger:`voltha-openolt-adapter gerrit<voltha-openolt-adapter>`
+     - :vol-git:`voltha-openolt-adapter git<voltha-openolt-adapter>`
      - Open OLT adapter
-   * - `voltha-openonu-adapter gerrit <:vol-ger:'voltha-openonu-adapter-go'>`_
-     - `voltha-openonu-adapter git <:vol-git:'voltha-openonu-adapter-go'>`_
+   * - :vol-ger:`voltha-openonu-adapter gerrit<voltha-openonu-adapter-go>`
+     - :vol-git:`voltha-openonu-adapter git<voltha-openonu-adapter-go>`
      - Open ONU adapter
-   * - `omci-lib gerrit <:vol-ger:'omci-lib-go'>`_
-     - `omci-lib git <:vol-git:'omci-lib-go'>`_
+   * - :vol-ger:`omci-lib gerrit<omci-lib-go>`
+     - :vol-git:`omci-lib git<omci-lib-go>`
      - OMCI Library
-   * - `voltha-cli gerrit <:vol-ger:'voltctl'>`_
-     - `voltha-cli git <:vol-git:'voltctl'>`_
+   * - :vol-ger:`voltha-cli gerrit<voltctl>`
+     - :vol-git:`voltha-cli git<voltctl>`
      - A CLI tool for managing and operating VOLTHA components.
-   * - `voltha-ofagent gerrit <:vol-ger:'ofagent-go'>`_
-     - `voltha-ofagent git <:vol-git:'ofagent-go'>`_
+   * - :vol-ger:`voltha-ofagent gerrit<ofagent-go>`
+     - :vol-git:`voltha-ofagent git<ofagent-go>`
      - OpenFlow management interface for Voltha
-   * - `voltha-onos gerrit <:vol-ger:'voltha-onos'>`_
-     - `voltha-onos git <:vol-git:'voltha-onos'>`_
+   * - :vol-ger:`voltha-onos gerrit<voltha-onos>`
+     - :vol-git:`voltha-onos git<voltha-onos>`
      - VOLTHA ONOS Development Build Environment.
-   * - `voltha-lib gerrit <:vol-ger:'voltha-lib-go'>`_
-     - `voltha-lib git <:vol-git:'voltha-lib-go'>`_
+   * - :vol-ger:`voltha-lib gerrit<voltha-lib-go>`
+     - :vol-git:`voltha-lib git<voltha-lib-go>`
      - Library for common VOLTHA functions
-   * - `voltha-protos gerrit <:vol-ger:'voltha-protos'>`_
-     - `voltha-protos git <:vol-git:'voltha-protos'>`_
+   * - :vol-ger:`voltha-protos gerrit<voltha-protos>`
+     - :vol-git:`voltha-protos git<voltha-protos>`
      - Protobuf definitions for VOLTHA
-   * - `device-management-interface gerrit <:vol-ger:'device-management-interface'>`_
-     - `device-management-interface git <:vol-git:'device-management-interface'>`_
+   * - :vol-ger:`device-management-interface gerrit<device-management-interface>`
+     - :vol-git:`device-management-interface git<device-management-interface>`
      - Device Management Interface
-   * - `voltha-helm-charts gerrit <:vol-ger:'voltha-helm-charts'>`_
-     - `voltha-helm-charts git <:vol-git:'voltha-helm-charts'>`_
+   * - :vol-ger:`voltha-helm-charts gerrit<voltha-helm-charts>`
+     - :vol-git:`voltha-helm-charts git<voltha-helm-charts>`
      - Helm charts for deploying VOLTHA
-   * - `ci-management gerrit <:vol-ger:'ci-management'>`_
-     - `ci-management git <:vol-git:'ci-management'>`_
+   * - :vol-ger:`ci-management gerrit<ci-management>`
+     - :vol-git:`ci-management git<ci-management>`
      - Configuration for the Jenkins testing infrastructure
-   * - `voltha-system-tests gerrit <:vol-ger:'voltha-system-tests'>`_
-     - `voltha-system-tests git <:vol-git:'voltha-system-tests'>`_
+   * - :vol-ger:`voltha-system-tests gerrit<voltha-system-tests>`
+     - :vol-git:`voltha-system-tests git<voltha-system-tests>`
      - Automated test-suites to validate the stability/functionality of VOLTHA.
-   * - `pod-configs gerrit <:vol-ger:'pod-configs'>`_
-     - `pod-configs git <:vol-git:'pod-configs'>`_
+   * - :vol-ger:`pod-configs gerrit<pod-configs>`
+     - :vol-git:`pod-configs git<pod-configs>`
      - Configuration files for VOLTHA labs
-   * - `voltha-docs gerrit <:vol-ger:'voltha-docs'>`_
-     - `voltha-docs git <:vol-git:'voltha-docs'>`_
+   * - :vol-ger:`voltha-docs gerrit<voltha-docs>`
+     - :vol-git:`voltha-docs git<voltha-docs>`
      - VOLTHA Documentation
-
-