diff --git a/.env b/.env
index b8640c2d..d8dc672c 100644
--- a/.env
+++ b/.env
@@ -1,16 +1,16 @@
-OL_REFERENCE_UI_VERSION=5.1.4-SNAPSHOT
+OL_REFERENCE_UI_VERSION=5.1.4
-OL_REQUISITION_VERSION=8.0.0-SNAPSHOT
-OL_REFERENCEDATA_VERSION=13.0.0-SNAPSHOT
-OL_AUTH_VERSION=4.1.2-SNAPSHOT
-OL_NOTIFICATION_VERSION=4.1.0-SNAPSHOT
-OL_FULFILLMENT_VERSION=8.0.2-SNAPSHOT
-OL_CCE_VERSION=1.0.3-SNAPSHOT
-OL_STOCKMANAGEMENT_VERSION=4.1.0-SNAPSHOT
-OL_REPORT_VERSION=1.1.3-SNAPSHOT
-OL_HAPIFHIR_VERSION=2.0.0-SNAPSHOT
+OL_REQUISITION_VERSION=8.0.0
+OL_REFERENCEDATA_VERSION=13.0.0
+OL_AUTH_VERSION=4.1.2
+OL_NOTIFICATION_VERSION=4.1.0
+OL_FULFILLMENT_VERSION=8.0.2
+OL_CCE_VERSION=1.0.3
+OL_STOCKMANAGEMENT_VERSION=4.1.0
+OL_REPORT_VERSION=1.1.3
+OL_HAPIFHIR_VERSION=2.0.0
-OL_DIAGNOSTICS_VERSION=1.0.3-SNAPSHOT
+OL_DIAGNOSTICS_VERSION=1.0.3
OL_NGINX_VERSION=5
OL_RSYSLOG_VERSION=1
diff --git a/docs/source/collect-docs.py b/docs/source/collect-docs.py
index 95bf8348..6b91d2c3 100644
--- a/docs/source/collect-docs.py
+++ b/docs/source/collect-docs.py
@@ -1,47 +1,49 @@
import urllib
#components
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-fulfillment/master/README.md", "components/fulfillmentService.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-requisition/master/README.md", "components/requisitionService.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-auth/master/README.md", "components/authService.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-auth/master/DESIGN.md", "components/authServiceDesign.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-cce/master/README.md", "components/cceService.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-notification/master/README.md", "components/notificationService.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-referencedata/master/README.md", "components/referencedataService.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-stockmanagement/master/README.md", "components/stockmanagementService.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-report/master/README.md", "components/reportService.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-template-service/master/README.md", "components/templateServiceService.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-reference-ui/master/README.md", "components/referenceUI.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-auth-ui/master/README.md", "components/authUI.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-cce-ui/master/README.md", "components/cceUI.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-referencedata-ui/master/README.md", "components/referencedataUI.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-report-ui/master/README.md", "components/reportUI.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-requisition-ui/master/README.md", "components/requisitionUI.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-fulfillment-ui/master/README.md", "components/fulfillmentUI.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-stockmanagement-ui/master/README.md", "components/stockmanagementUI.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/dev-ui/master/README.md", "components/devUI.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-ui-components/master/README.md", "components/uiComponents.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-ui-components/master/docs/index.md", "components/uiOverview.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-ui-components/master/docs/extension_guide.md", "components/uiExtensionGuide.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-ui-layout/master/README.md", "components/uiLayout.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-fulfillment/v8.0.2/README.md", "components/fulfillmentService.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-requisition/v8.0.0/README.md", "components/requisitionService.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-auth/v4.1.2/README.md", "components/authService.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-auth/v4.1.2/DESIGN.md", "components/authServiceDesign.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-cce/v1.0.3/README.md", "components/cceService.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-notification/v4.1.0/README.md", "components/notificationService.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-referencedata/v13.0.0/README.md", "components/referencedataService.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-stockmanagement/v4.1.0/README.md", "components/stockmanagementService.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-report/v1.1.3/README.md", "components/reportService.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-hapifhir/v2.0.0/README.md", "components/hapifhirService.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-diagnostics/v1.0.3/README.md", "components/diagnosticsService.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-template-service/v3.6.0/README.md", "components/templateServiceService.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-reference-ui/v5.1.4/README.md", "components/referenceUI.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-auth-ui/v6.2.0/README.md", "components/authUI.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-cce-ui/v1.0.3/README.md", "components/cceUI.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-referencedata-ui/v5.5.1/README.md", "components/referencedataUI.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-report-ui/v5.2.0/README.md", "components/reportUI.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-requisition-ui/v6.0.0/README.md", "components/requisitionUI.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-fulfillment-ui/v6.0.3/README.md", "components/fulfillmentUI.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-stockmanagement-ui/v2.0.3/README.md", "components/stockmanagementUI.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/dev-ui/v9.0.0/README.md", "components/devUI.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-ui-components/v7.1.0/README.md", "components/uiComponents.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-ui-components/v7.1.0/docs/index.md", "components/uiOverview.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-ui-components/v7.1.0/docs/extension_guide.md", "components/uiExtensionGuide.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-ui-layout/v5.1.3/README.md", "components/uiLayout.md")
#conventions
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-template-service/master/STYLE-GUIDE.md", "conventions/codeStyleguide.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-template-service/master/TESTING.md", "conventions/testing.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-template-service/master/ERROR_HANDLING.md", "conventions/errorHandling.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-template-service/master/LICENSE-HEADER.md", "conventions/licenseHeader.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-ui-components/master/docs/conventions.md", "conventions/uiConventions.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-ui-components/master/docs/conventions-angularjs.md", "conventions/uiAngularjs.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-ui-components/master/docs/conventions-javascript.md", "conventions/uiJavascript.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-ui-components/master/docs/conventions-markup.md", "conventions/uiMarkup.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-ui-components/master/docs/conventions-testing.md", "conventions/uiTesting.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-ui-components/master/docs/information-architecture.md", "conventions/uiInformationArchitecture.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-ui-components/master/docs/performance.md", "conventions/uiPerformance.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-template-service/v3.6.0/STYLE-GUIDE.md", "conventions/codeStyleguide.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-template-service/v3.6.0/TESTING.md", "conventions/testing.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-template-service/v3.6.0/ERROR_HANDLING.md", "conventions/errorHandling.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-template-service/v3.6.0/LICENSE-HEADER.md", "conventions/licenseHeader.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-ui-components/v7.1.0/docs/conventions.md", "conventions/uiConventions.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-ui-components/v7.1.0/docs/conventions-angularjs.md", "conventions/uiAngularjs.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-ui-components/v7.1.0/docs/conventions-javascript.md", "conventions/uiJavascript.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-ui-components/v7.1.0/docs/conventions-markup.md", "conventions/uiMarkup.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-ui-components/v7.1.0/docs/conventions-testing.md", "conventions/uiTesting.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-ui-components/v7.1.0/docs/information-architecture.md", "conventions/uiInformationArchitecture.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-ui-components/v7.1.0/docs/performance.md", "conventions/uiPerformance.md")
# deployment
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-deployment/master/deploymentTopology.md", "deployment/topology.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-deployment/master/provision/Provision-single-host.md", "deployment/provisionSingleHost.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-deployment/master/provision/Provision-swarm-With-ELB.md", "deployment/provisionSwarmWithELB.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-deployment/master/provision/Provision-swarm-With-Elastic-ip.md", "deployment/provisionSwarmWithElasticIp.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-deployment/master/provision/RDS-configuration.md", "deployment/rdsConfiguration.md")
-urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-deployment/master/deployment/README.md", "deployment/demoAndCiJenkins.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-deployment/v3.6.0/deploymentTopology.md", "deployment/topology.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-deployment/v3.6.0/provision/Provision-single-host.md", "deployment/provisionSingleHost.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-deployment/v3.6.0/provision/Provision-swarm-With-ELB.md", "deployment/provisionSwarmWithELB.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-deployment/v3.6.0/provision/Provision-swarm-With-Elastic-ip.md", "deployment/provisionSwarmWithElasticIp.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-deployment/v3.6.0/provision/RDS-configuration.md", "deployment/rdsConfiguration.md")
+urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-deployment/v3.6.0/deployment/README.md", "deployment/demoAndCiJenkins.md")
diff --git a/docs/source/components/erd-auth.rst b/docs/source/components/erd-auth.rst
index 15e85e85..1c5a8ff7 100644
--- a/docs/source/components/erd-auth.rst
+++ b/docs/source/components/erd-auth.rst
@@ -5,4 +5,4 @@ Auth ERD
ERD schema of Auth service:
* `Live ERD `_
-* `Zip ERD `_
+* `Zip ERD `_
diff --git a/docs/source/components/erd-cce.rst b/docs/source/components/erd-cce.rst
index 9fe02567..39aceb63 100644
--- a/docs/source/components/erd-cce.rst
+++ b/docs/source/components/erd-cce.rst
@@ -5,4 +5,4 @@ CCE ERD
ERD schema of CCE service:
* `Live ERD `_
-* `Zip ERD `_
+* `Zip ERD `_
diff --git a/docs/source/components/erd-fulfillment.rst b/docs/source/components/erd-fulfillment.rst
index bfaf66de..94fcdca8 100644
--- a/docs/source/components/erd-fulfillment.rst
+++ b/docs/source/components/erd-fulfillment.rst
@@ -5,4 +5,4 @@ Fulfillment ERD
ERD schema of Fulfillment service:
* `Live ERD `_
-* `Zip ERD `_
+* `Zip ERD `_
diff --git a/docs/source/components/erd-notification.rst b/docs/source/components/erd-notification.rst
index 49efd1d8..5ceea3a9 100644
--- a/docs/source/components/erd-notification.rst
+++ b/docs/source/components/erd-notification.rst
@@ -5,4 +5,4 @@ Notification ERD
ERD schema of Notification service:
* `Live ERD `_
-* `Zip ERD `_
+* `Zip ERD `_
diff --git a/docs/source/components/erd-referencedata.rst b/docs/source/components/erd-referencedata.rst
index d8f65855..19acef16 100644
--- a/docs/source/components/erd-referencedata.rst
+++ b/docs/source/components/erd-referencedata.rst
@@ -5,4 +5,4 @@ Reference Data ERD
ERD schema of Reference Data service:
* `Live ERD `_
-* `Zip ERD `_
+* `Zip ERD `_
diff --git a/docs/source/components/erd-report.rst b/docs/source/components/erd-report.rst
index 1cb36296..1c3e650a 100644
--- a/docs/source/components/erd-report.rst
+++ b/docs/source/components/erd-report.rst
@@ -5,4 +5,4 @@ Report ERD
ERD schema of Report service:
* `Live ERD `_
-* `Zip ERD `_
+* `Zip ERD `_
diff --git a/docs/source/components/erd-requisition.rst b/docs/source/components/erd-requisition.rst
index e49dace5..513d97d5 100644
--- a/docs/source/components/erd-requisition.rst
+++ b/docs/source/components/erd-requisition.rst
@@ -5,4 +5,4 @@ Requisition ERD
ERD schema of Requisition service:
* `Live ERD `_
-* `Zip ERD `_
+* `Zip ERD `_
diff --git a/docs/source/components/erd-stockmanagement.rst b/docs/source/components/erd-stockmanagement.rst
index 8f454b3e..d02969b8 100644
--- a/docs/source/components/erd-stockmanagement.rst
+++ b/docs/source/components/erd-stockmanagement.rst
@@ -5,4 +5,4 @@ Stock Management ERD
ERD schema of Stock Management service:
* `Live ERD `_
-* `Zip ERD `_
+* `Zip ERD `_
diff --git a/docs/source/components/index.rst b/docs/source/components/index.rst
index eb48878a..d5eb70f7 100644
--- a/docs/source/components/index.rst
+++ b/docs/source/components/index.rst
@@ -53,7 +53,7 @@ Auth Service works with the Reference Data service to handle role-based access c
- `Auth Service Design `_
- `Auth Service ERD `_
- `Live Documentation for Auth API `_
-- `Static Documentation for Auth API `_
+- `Static Documentation for Auth API `_
*******************
Fulfillment Service
@@ -67,7 +67,7 @@ warehouse systems.
- `Fulfillment Service README `_
- `Fulfillment ERD `_
- `Live Documentation for Fulfillment API `_
-- `Static Documentation for Fulfillment API `_
+- `Static Documentation for Fulfillment API `_
***********
CCE Service
@@ -81,7 +81,18 @@ inventory (tracking equipment at locations) and functional status. The catalog c
- `CCE Service README `_
- `CCE ERD `_
- `Live Documentation for CCE API `_
-- `Static Documentation for CCE API `_
+- `Static Documentation for CCE API `_
+
+*****************
+HAPI FHIR Service
+*****************
+
+The HAPI FHIR Service provides RESTful API endpoints for FHIR locations. It supports keeping
+OpenLMIS facility data in sync with external facility registries through FHIR.
+
+- `HAPI FHIR Service GitHub repo `_
+- `HAPI FHIR Service README `_
+- `Static Documentation for HAPI FHIR API `_
********************
Notification Service
@@ -94,7 +105,7 @@ email notifications to users. The Notification Service does not provide a web UI
- `Notification Service README `_
- `Notification ERD `_
- `Live Documentation for Notification API `_
-- `Static Documentation for Notification API `_
+- `Static Documentation for Notification API `_
**********************
Reference Data Service
@@ -110,7 +121,7 @@ or can be added and edited individually using the Reference Data Service APIs.
- `Reference Data Service README `_
- `Reference Data ERD `_
- `Live Documentation for Reference Data API `_
-- `Static Documentation for Reference Data API `_
+- `Static Documentation for Reference Data API `_
************
Reference UI
@@ -123,7 +134,7 @@ deployment for implementers to use.
Learn about the Reference UI:
- `OpenLMIS UI Overview `_ describes the UI architecture and tooling
-- `UI Styleguide `_
+- `UI Styleguide `_
shows examples and best practices for many re-usable components
- `Dev UI `_ documents the build process and commands used by all UI components
@@ -131,7 +142,7 @@ Coding and Customizing the UI:
- `UI Extension Guide `_
- UI :doc:`../conventions/index`
-- `Javascript Documentation `_
+- `Javascript Documentation `_
UI Repositories:
@@ -173,7 +184,7 @@ report storage, generation (including in PDF format), and seeding rights that us
- `Report Service README `_
- `Report ERD `_
- `Live Documentation for Report API `_
-- `Static Documentation for Report API `_
+- `Static Documentation for Report API `_
*******************
Requisition Service
@@ -189,7 +200,7 @@ programs and facilities.
- `Requisition Service README `_
- `Requisition ERD `_
- `Live Documentation for Requisition API `_
-- `Static Documentation for Requisition API `_
+- `Static Documentation for Requisition API `_
************************
Stock Management Service
@@ -202,7 +213,17 @@ recording stock transactions over time.
- `Stock Management Service README `_
- `Stock Management ERD `_
- `Live Documentation for Stock Management API `_
-- `Static Documentation for Stock Management API `_
+- `Static Documentation for Stock Management API `_
+
+*******************
+Diagnostics Service
+*******************
+
+The Diagnostics Service provides RESTful API endpoints for checking the system health.
+
+- `Diagnostics Service GitHub repo `_
+- `Diagnostics Service README `_
+- `Static Documentation for Diagnostics API `_
********************************
Reporting and Analytics Platform