diff --git a/Packages/worklist/both/schema.js b/Packages/worklist/both/schema.js
index dfa2aa670..b8d68f5d8 100644
--- a/Packages/worklist/both/schema.js
+++ b/Packages/worklist/both/schema.js
@@ -117,6 +117,10 @@ export const DIMSEServer = new SimpleSchema({
     name: serverNameDefinitions,
     type: serverTypeDefinitions,
     wadoUriRoot: wadoUriRootDefinitions,
+    requestOptions: {
+        type: DICOMWebRequestOptions,
+        label: 'Request Options'
+    },
     peers: {
         type: [DIMSEPeer],
         label: 'Peer List',
diff --git a/config/dcm4cheeDIMSE.json b/config/dcm4cheeDIMSE.json
index e6da512db..8da3f01b3 100644
--- a/config/dcm4cheeDIMSE.json
+++ b/config/dcm4cheeDIMSE.json
@@ -13,11 +13,17 @@
           "logRequests": true,
           "logResponses": false,
           "logTiming": true
-      }
+        }
     }],
     "dimse": [{
       "name": "DCM4CHEE_DIMSE",
       "wadoUriRoot": "http://localhost:8080/dcm4chee-arc/aets/DCM4CHEE/wado",
+      "requestOptions": {
+        "auth": "admin:admin",
+        "logRequests": true,
+        "logResponses": false,
+        "logTiming": true
+      },
       "peers": [
         {
           "host": "localhost",
diff --git a/config/localhostOrthancDIMSE.json b/config/localhostOrthancDIMSE.json
deleted file mode 100644
index 1947a0baa..000000000
--- a/config/localhostOrthancDIMSE.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-   "servers": {
-     "dicomWeb": [
-      {
-        "name": "Orthanc",
-        "wadoUriRoot" : "http://52.87.58.190:8043/wado",
-        "qidoRoot": "http://localhost:8042/dicom-web",
-        "wadoRoot": "http://localhost:8042/dicom-web",
-        "qidoSupportsIncludeField": false,
-        "imageRendering" : "wadouri",
-        "requestOptions" : {
-          "auth": "orthanc:orthanc",
-          "logRequests" : true,
-          "logResponses" : false,
-          "logTiming" : true
-        }
-      }
-     ],
-     "dimse": [{
-       "name": "OrthancDIMSE",
-       "wadoUriRoot" : "http://52.87.58.190:8043/wado",
-       "peers": [
-         {
-			"host" : "localhost",
-			"port" : 4242,
-			"aeTitle" : "ORTHANC",
-			"default": true,
-            "supportsInstanceRetrievalByStudyUid": true
-         },
-         {
-            "host" : "0.0.0.0",
-            "port" : 11112,
-            "aeTitle" : "OHIFDCM",
-            "default" : true,
-            "server" : true
-         }
-       ]
-     }]
-   },
-   "defaultServiceType": "dimse"
- }
diff --git a/config/orthancDIMSE.json b/config/orthancDIMSE.json
index 3f1727c13..799111d81 100644
--- a/config/orthancDIMSE.json
+++ b/config/orthancDIMSE.json
@@ -1,24 +1,14 @@
 {
   "servers": {
-    "dicomWeb": [
-      {
-        "name": "Orthanc",
-        "wadoUriRoot": "http://localhost:8042/wado",
-        "qidoRoot": "http://localhost:8042/dicom-web",
-        "wadoRoot": "http://localhost:8042/dicom-web",
-        "qidoSupportsIncludeField": false,
-        "imageRendering": "wadouri",
-        "requestOptions": {
-          "auth": "orthanc:orthanc",
-          "logRequests": true,
-          "logResponses": false,
-          "logTiming": true
-        }
-      }
-    ],
     "dimse": [{
       "name": "ORTHANC_DIMSE",
       "wadoUriRoot": "http://localhost:8042/wado",
+      "requestOptions": {
+        "auth": "orthanc:orthanc",
+        "logRequests": true,
+        "logResponses": false,
+        "logTiming": true
+      },
       "peers": [
         {
           "host": "localhost",