diff --git a/docker/Nginx-Orthanc/docker-compose.yml b/docker/Nginx-Orthanc/docker-compose.yml
index 26e797514..62cf8df25 100644
--- a/docker/Nginx-Orthanc/docker-compose.yml
+++ b/docker/Nginx-Orthanc/docker-compose.yml
@@ -1,17 +1,6 @@
 version: '3.5'
 
 services:
-  proxy:
-    image: nginx:1.15-alpine
-    ports:
-      - 8899:80
-    volumes:
-      - ./config/nginx.conf:/etc/nginx/nginx.conf:ro
-    restart: unless-stopped
-
-  # LINK: https://hub.docker.com/r/jodogne/orthanc-plugins/
-  # TODO: Update to use Postgres
-  # https://github.com/mrts/docker-postgresql-multiple-databases
   orthanc:
     image: jodogne/orthanc-plugins:1.5.6
     hostname: orthanc
@@ -20,7 +9,7 @@ services:
       - ./config/orthanc.json:/etc/orthanc/orthanc.json:ro
       # Persist data
       - ./volumes/orthanc-db/:/var/lib/orthanc/db/
-    # ports:
-    #  - '4242:4242' # DICOM
-    #  - '8042:8042' # Web
+    ports:
+      - '4242:4242' # DICOM
+      - '8042:8042' # Web
     restart: unless-stopped
diff --git a/docs/latest/essentials/data-source.md b/docs/latest/essentials/data-source.md
index 7d828e8a0..5a6fdbc8f 100644
--- a/docs/latest/essentials/data-source.md
+++ b/docs/latest/essentials/data-source.md
@@ -29,11 +29,15 @@ For our purposes, we will be using `Orthanc`, but you can see a list of
 
 - Docker
   - [Docker for Mac](https://docs.docker.com/docker-for-mac/)
-  - [Docker for Windows](https://docs.docker.com/docker-for-windows/)
+  - [Docker for Windows (recommended)](https://docs.docker.com/docker-for-windows/)
+  - [Docker Toolbox for Windows](https://docs.docker.com/toolbox/toolbox_install_windows/)
 
 _Not sure if you have `docker` installed already? Try running `docker --version`
 in command prompt or terminal_
 
+If you are using Docker Toolbox you need to change the _proxy_ parameter in
+_package.json_ to http://192.168.99.100:8042 or the ip docker-machine ip throws.
+
 ### Running Orthanc
 
 _Start Orthanc:_
@@ -112,7 +116,7 @@ window.config = {
       },
     ],
   },
-}
+};
 ```
 
 To learn more about how you can configure the OHIF Viewer, check out our
diff --git a/package.json b/package.json
index 5fa923387..2cdf9ddb4 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "node": ">=8",
     "npm": ">=5"
   },
+  "proxy": "http://localhost:8042",
   "scripts": {
     "cm": "npx git-cz",
     "dev": "yarn run preBuild && cross-env PORT=5000 react-scripts start",
diff --git a/public/config/docker_nginx-orthanc.js b/public/config/docker_nginx-orthanc.js
index b184c5a9d..b200b4b9f 100644
--- a/public/config/docker_nginx-orthanc.js
+++ b/public/config/docker_nginx-orthanc.js
@@ -5,9 +5,9 @@ window.config = {
     dicomWeb: [
       {
         name: 'Orthanc',
-        wadoUriRoot: 'http://localhost:8899/wado',
-        qidoRoot: 'http://localhost:8899/dicom-web',
-        wadoRoot: 'http://localhost:8899/dicom-web',
+        wadoUriRoot: '/wado',
+        qidoRoot: '/dicom-web',
+        wadoRoot: '/dicom-web',
         qidoSupportsIncludeField: false,
         imageRendering: 'wadors',
         thumbnailRendering: 'wadors',
@@ -17,4 +17,4 @@ window.config = {
       },
     ],
   },
-}
+};
diff --git a/src/utils/initWebWorkers.js b/src/utils/initWebWorkers.js
index 462d065da..b7e04ad63 100644
--- a/src/utils/initWebWorkers.js
+++ b/src/utils/initWebWorkers.js
@@ -6,18 +6,21 @@ import cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader';
  * @param {String} webWorkScriptsPath
  */
 export default function(baseDirectory, webWorkScriptsPath) {
-  const scriptsPath = `${window.location.protocol}//${
+  let scriptsPath = `${window.location.protocol}//${
     window.location.host
-  }${baseDirectory}/${webWorkScriptsPath}`;
+  }${baseDirectory}`;
+  if (webWorkScriptsPath) {
+    scriptsPath += `/${webWorkScriptsPath}/`;
+  }
   const config = {
     maxWebWorkers: Math.max(navigator.hardwareConcurrency - 1, 1),
     startWebWorkersOnDemand: true,
-    webWorkerPath: `${scriptsPath}/cornerstoneWADOImageLoaderWebWorker.min.js`,
+    webWorkerPath: `${scriptsPath}cornerstoneWADOImageLoaderWebWorker.min.js`,
     taskConfiguration: {
       decodeTask: {
         loadCodecsOnStartup: true,
         initializeCodecsOnStartup: false,
-        codecsPath: `${scriptsPath}/cornerstoneWADOImageLoaderCodecs.min.js`,
+        codecsPath: `${scriptsPath}cornerstoneWADOImageLoaderCodecs.min.js`,
         usePDFJS: false,
         strict: false,
       },