diff --git a/config/orthanc/housekeeper.json b/config/orthanc/housekeeper.json
new file mode 100644
index 0000000..8f76bd7
--- /dev/null
+++ b/config/orthanc/housekeeper.json
@@ -0,0 +1,25 @@
+{
+    "Housekeeper": {
+        "Enable": true,
+        "GlobalPropertyId": 1971,
+        "Force": false,
+        "ThrottleDelay": 15,
+        "Schedule": {
+            "Monday": ["3-6"],
+            "Tuesday": ["3-6"],
+            "Wednesday": ["3-6"],
+            "Thursday": ["3-6"],
+            "Friday": ["3-6"],
+            "Saturday": ["3-6"],
+            "Sunday": ["3-6"]
+        },
+        "Triggers": {
+            "StorageCompressionChange": true,
+            "MainDicomTagsChange": true,
+            "UnnecessaryDicomAsJsonFiles": true,
+            "IngestTranscodingChange": true,
+            "DicomWebCacheChange": true
+        },
+        "LimitMainDicomTagsReconstructLevel": "Study"
+    }
+}
\ No newline at end of file
diff --git a/config/orthanc/modalities.json b/config/orthanc/modalities.json
new file mode 100644
index 0000000..e2aca03
--- /dev/null
+++ b/config/orthanc/modalities.json
@@ -0,0 +1,5 @@
+{
+  "DicomModalities": {
+    // "sample" : [ "STORESCP", "127.0.0.1", 2000 ]
+  }
+}
\ No newline at end of file
diff --git a/config/orthanc/multitenant.json b/config/orthanc/multitenant.json
new file mode 100644
index 0000000..eaa6dbd
--- /dev/null
+++ b/config/orthanc/multitenant.json
@@ -0,0 +1,13 @@
+{
+  "MultitenantDicom" : {
+    "Servers" : [
+      {
+        "AET" : "BLKFSHIN",
+        "Port" : 4243,
+        "Labels" : [ "BLACKFISH_CHENNAI" ],
+        "LabelsConstraint" : "All",
+        "LabelsStoreLevels" : [ "Patient", "Study", "Series", "Instance" ]
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/config/orthanc/orthanc.json b/config/orthanc/orthanc.json
index 77c8c81..6276e5c 100644
--- a/config/orthanc/orthanc.json
+++ b/config/orthanc/orthanc.json
@@ -1,7 +1,11 @@
 {
-  "Name": "BlackFish",
+  "Name": "${ORTHANC_NAME:-BlackFish}",
   "StorageDirectory": "/var/lib/orthanc/db",
   "IndexDirectory": "/var/lib/orthanc/db",
+  "DicomServerEnabled": true,
+  "DicomAet": "${DICOM_AET:-BLACKFISH}",
+  "DicomCheckCalledAet": false,
+  "DicomPort": ${DICOM_PORT:-4242},
   "StorageCompression": true,
   "MaximumStorageSize": 0,
   "MaximumPatientCount": 0,
@@ -79,10 +83,6 @@
   "WebDavEnabled": true,
   "WebDavDeleteAllowed": false,
   "WebDavUploadAllowed": true,
-  "DicomServerEnabled": true,
-  "DicomAet": "BLACKFISH",
-  "DicomCheckCalledAet": false,
-  "DicomPort": 4242,
   "DefaultEncoding": "Utf8",
   "AcceptedTransferSyntaxes": [
     "1.2.840.10008.1.*"
@@ -109,9 +109,6 @@
   "DicomAlwaysAllowGet": false,
   "DicomAlwaysAllowMove": false,
   "DicomCheckModalityHost": false,
-  "DicomModalities": {
-    // "sample" : [ "STORESCP", "127.0.0.1", 2000 ]
-  },
   "DicomModalitiesInDatabase": false,
   "DicomEchoChecksFind": false,
   "DicomScuTimeout": 10,
diff --git a/config/orthanc/webviewer.json b/config/orthanc/webviewer.json
new file mode 100644
index 0000000..edf642c
--- /dev/null
+++ b/config/orthanc/webviewer.json
@@ -0,0 +1,7 @@
+{
+  "WebViewer": {
+    "CachePath": "WebViewerCache",
+    "CacheSize": 128,
+    "Threads": 4
+  }
+}
\ No newline at end of file