diff --git a/docker-compose.yml b/docker-compose.yml
index bb28dd1..7c4ea53 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -88,6 +88,8 @@ services:
             - ./volumes/tomcat/oe_server_3x.xml:/usr/local/tomcat/conf/server.xml
             - ./volumes/logs/oeLogs:/var/lib/openelis-global/logs
             - ./volumes/logs/tomcatLogs/:/usr/local/tomcat/logs
+            - ./volumes/properties/SystemConfiguration.properties:/var/lib/openelis-global/properties/SystemConfiguration.properties
+            -  lucene_index-vol:/var/lib/lucene_index
             
         secrets:
             - source: datasource.password
diff --git a/volumes/properties/SystemConfiguration.properties b/volumes/properties/SystemConfiguration.properties
new file mode 100644
index 0000000..c18f096
--- /dev/null
+++ b/volumes/properties/SystemConfiguration.properties
@@ -0,0 +1,130 @@
+# System Config properties
+###### Un comment the properties below to overide the Configuration proporties from the DB
+# date.ambiguous.date.value=
+# date.ambiguous.date.holder=
+# organization.reference.lab.parent=
+# setFieldForm=
+# passwordRequirements=
+# stringContext=
+# statusRules=
+# siteNumber=
+# SiteName=
+# Address line 1 label=
+# Address line 2 label=
+# Address line 3 label=
+# Geographic Unit 1 Label=
+# Geographic Unit 2 Label=
+# acessionFormat=
+# reflexAction=
+# TrainingInstallation=
+# useExternalPatientSource=
+# patientSearchURL=
+# patientSearchLogOnUser=
+# PatientSearchPassword=
+# PatientSearchEnabled=
+# lab director=
+# allowLanguageChange=
+# resultReporting=
+# resultReportingURL=
+# malariaSurReport=
+# malariaSurURL=
+# malariaCaseReport=
+# malariaCaseURL=
+# releaseNumber=
+# configuration name=
+# testUsageAggregationUrl=
+# testUsageReporting=
+# modify results role=
+# modify results note required=
+# ResultTechnicianName=
+# customCriticalMessage=
+# allowResultRejection=
+# restrictFreeTextRefSiteEntry=
+# restrictFreeTextMethodEntry=
+# restrictFreeTextProviderEntry=
+# autoFillTechNameBox=
+# autoFillTechNameUser=
+# auto-fill collection date/time=
+# showValidationFailureIcon=
+# results.send.retry.time=
+# trackPayment=
+# validateAccessionNumber=
+# alertWhenInvalidResult=
+# default language locale=
+# default date locale=
+# condenseNFS=
+# roleForPatientOnResults=
+# reportPageNumbers=
+# sortQaEvents=
+# validate all results=
+# additional site info=
+# subject on workplan=
+# next visit on workplan=
+# results on workplan=
+# external orders=
+# non-conformity signature=
+# Reception as unit=
+# Collection as unit=
+# Accession number prefix=
+# validationOnlyNotesAreExternal=
+# phone format=
+# validate phone format=
+# Allow duplicate subject number=
+# Allow duplicate national ids=
+# validateTechnicalRejection=
+# augmentTestNameWithType=
+# billingRefNumber=
+# billingRefNumberLocalization=
+# Program=
+# bannerHeading=
+# 24 hour clock=
+# supportPatientNationality=
+# Patient ID required=
+# Subject number required=
+# National ID required=
+# sample id required=
+# numMaxOrderLabels=
+# numMaxSpecimenLabels=
+# numMaxAliquotLabels=
+# numDefaultOrderLabels=
+# numDefaultSpecimenLabels=
+# numDefaultAliquotLabels=
+# heightOrderLabels=
+# widthOrderLabels=
+# heightSpecimenLabels=
+# widthSpecimenLabels=
+# collectionDateCheck=
+# patientSexCheck=
+# collectedByCheck=
+# testsCheck=
+# heightBlockLabels=
+# widthBlockLabels=
+# heightSlideLabels=
+# widthSlideLabels=
+# prePrintAltAccessionPrefix=
+# prePrintUseAltAccession=
+# useAlphanumAccessionPrefix=
+# alphanumAccessionPrefix=
+# labDirectorName=
+# labDirectorTitle=
+# infoHighway.username=
+# infoHighway.password=
+# infoHighway.uri=
+# infoHighway.enabled=
+# patientresultsbmpsms.username=
+# patientresultsbmpsms.password=
+# patientresultsbmpsms.uri=
+# patientresultsbmpsms.enabled=
+# patientresultssmpp.username=
+# patientresultssmpp.password=
+# patientresultssmpp.uri=
+# patientresultssmpp.enabled=
+# patientresultssmtp.username=
+# patientresultssmtp.password=
+# patientresultssmtp.uri=
+# patientresultssmtp.enabled=
+# contactTracingEnabled=
+#requireLabUnitAtLogin=
+# enableClientRegistry=
+
+
diff --git a/volumes/properties/common.properties b/volumes/properties/common.properties
index 1882cf0..73d9cce 100644
--- a/volumes/properties/common.properties
+++ b/volumes/properties/common.properties
@@ -8,18 +8,48 @@ server.ssl.trust-store-password=tspass
 encryption.general.password=kspass
 
 org.openelisglobal.fhirstore.uri=https://fhir.openelis.org:8443/fhir/
+org.openelisglobal.fhirstore.username=admin
+org.openelisglobal.fhirstore.password=adminADMIN!
+org.openelisglobal.fhir.subscriber.allowHTTP=true
 
+#open client registry authentication
+org.openelisglobal.crserver.uri=
+org.openelisglobal.crserver.username=
+org.openelisglobal.crserver.password=
+
+# Remote FHIR server/Consolidated Server
 org.openelisglobal.remote.source.uri=
 org.openelisglobal.remote.source.updateStatus=false
 org.openelisglobal.remote.source.identifier=
+org.openelisglobal.remote.poll.frequency=120000
 org.openelisglobal.task.useBasedOn=true
 
 org.openelisglobal.fhir.subscriber=
 org.openelisglobal.fhir.subscriber.resources=Task,Patient,ServiceRequest,DiagnosticReport,Observation,Specimen,Practitioner,Encounter
 
-#org.openelisglobal.facilitylist.fhirstore = http://localhost:4000/fhir/DEFAULT
-# org.openelisglobal.facilitylist.authurl= http://localhost:4000/auth/token
-# org.openelisglobal.facilitylist.username= root@gofr.org
-# org.openelisglobal.facilitylist.password= gofr
-# org.openelisglobal.facilitylist.auth= token
+#Facility FHIR fhirstore
+org.openelisglobal.facilitylist.fhirstore =  
+org.openelisglobal.facilitylist.authurl=  
+org.openelisglobal.facilitylist.username=  
+org.openelisglobal.facilitylist.password=  
+org.openelisglobal.facilitylist.auth= 
 facilitylist.schedule.fixedRate=864000000
+
+#provider FHIR server
+org.openelisglobal.providerlist.fhirstore=
+org.openelisglobal.requester.identifier=Practitioner/f9badd80-ab76-11e2-9e96-0800200c9a66
+org.openelisglobal.providerlist.poll.frequency=3600000
+org.openelisglobal.requester.lastName=Dr. Mauritius
+org.openelisglobal.requester.firstName=Felix
+org.openelisglobal.requester.phone=230 5123 1234
+
+#Hibernate Config 
+#spring.jpa.show-sql=true
+#spring.jpa.properties.hibernate.format_sql=true
+
+#Paging properties
+org.openelisglobal.paging.patients.pageSize=99
+org.openelisglobal.paging.results.pageSize=99
+org.openelisglobal.paging.validation.pageSize=99
+org.openelisglobal.paging.displaylist.pageSize=99
+