diff --git a/LesionTracker/defaultSettings.js b/LesionTracker/defaultSettings.js
index b6d340449..e980b8441 100644
--- a/LesionTracker/defaultSettings.js
+++ b/LesionTracker/defaultSettings.js
@@ -26,10 +26,12 @@ Meteor.startup(function() {
             }],
             dimse: [{
                 name: "ORTHANC_DIMSE",
-                host: 'localhost',
-                port: 4242,
-                aeTitle: 'ORTHANC',
-                default: true
+                peers: [{
+                    host: 'localhost',
+                    port: 4242,
+                    aeTitle: 'ORTHANC',
+                    default: true
+                }]
             }]
         },
         "defaultServiceType": 'dicomWeb',
diff --git a/OHIFViewer/defaultSettings.js b/OHIFViewer/defaultSettings.js
index d97c40419..dd60c7cb8 100644
--- a/OHIFViewer/defaultSettings.js
+++ b/OHIFViewer/defaultSettings.js
@@ -26,9 +26,11 @@ Meteor.startup(function() {
             }],
             dimse: [{
                 name: "ORTHANC_DIMSE",
-                host: 'localhost',
-                port: 4242,
-                hostAE: 'ORTHANC'
+                peers: [{
+                    host: 'localhost',
+                    port: 4242,
+                    hostAE: 'ORTHANC'
+                }]
             }]
         },
         defaultServiceType: 'dicomWeb',
diff --git a/Packages/worklist/server/services/dimse/instances.js b/Packages/worklist/server/services/dimse/instances.js
index f460dfc5d..6a3080e2d 100755
--- a/Packages/worklist/server/services/dimse/instances.js
+++ b/Packages/worklist/server/services/dimse/instances.js
@@ -31,6 +31,8 @@ function resultDataToStudyMetadata(resultData) {
             seriesList.push(series);
         }
 
+        // TODO: Check which peer it should point to | brunoalvesdefaria
+        var server = Meteor.settings.servers.dimse[0].peers[0];
         var host = Meteor.settings.servers.dimse.host,
             port = Meteor.settings.servers.dimse.port;
 
diff --git a/config/dockerDCM4CHE.json b/config/dockerDCM4CHE.json
index c77e91ced..568c42302 100644
--- a/config/dockerDCM4CHE.json
+++ b/config/dockerDCM4CHE.json
@@ -19,9 +19,11 @@
     "dimse": [
       {
         "name": "DCM4CHE_DIMSE",
-        "host": "192.168.99.100",
-        "port": 11112,
-        "hostAE": "DCM4CHE"
+        "peers": [{
+          "host": "192.168.99.100",
+          "port": 11112,
+          "hostAE": "DCM4CHE"
+        }]
       }
     ]
   },
diff --git a/config/localhostOrthanc.json b/config/localhostOrthanc.json
index 2c0527a2c..5447d0702 100644
--- a/config/localhostOrthanc.json
+++ b/config/localhostOrthanc.json
@@ -20,9 +20,11 @@
     "dimse": [
       {
         "name": "ORTHANC_DIMSE",
-        "host": "localhost",
-        "port": 4242,
-        "hostAE": "ORTHANC"
+        "peers": [{
+          "host": "localhost",
+          "port": 4242,
+          "hostAE": "ORTHANC"
+        }]
       }
     ]
   },
diff --git a/config/orthancDIMSE.json b/config/orthancDIMSE.json
index fce99ad90..eaf0ffcf9 100644
--- a/config/orthancDIMSE.json
+++ b/config/orthancDIMSE.json
@@ -19,17 +19,21 @@
     ],
     "dimse": [{
       "name": "ORTHANC_DIMSE",
-      "host": "localhost",
-      "port": 4242,
-      "aeTitle": "ORTHANC",
-      "default": true
-    },{
-      "name": "OHIFDCM_DIMSE",
-      "host": "0.0.0.0",
-      "port": 11112,
-      "aeTitle": "OHIFDCM",
-      "default": true,
-      "server": true
+      "peers": [
+        {
+          "host": "localhost",
+          "port": 4242,
+          "aeTitle": "ORTHANC",
+          "default": true
+        },
+        {
+          "host": "0.0.0.0",
+          "port": 11112,
+          "aeTitle": "OHIFDCM",
+          "default": true,
+          "server": true
+        }
+      ]
     }]
   },
   "defaultServiceType": "dimse"