diff --git a/.dockerignore b/.dockerignore
index 750935f33..67f1b2e98 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,10 +1,16 @@
+# Output
 dist/
+
+# Dependencies
 node_modules/
-.git
+
+# Root
+README.md
 Dockerfile
+
+# Misc. Config
+.git
 .DS_Store
 .gitignore
-README.md
 .vscode
 .circleci
-example/
diff --git a/docker/authproxy/README.md b/docker/OpenResty-Orthanc-Keycloak/README.md
similarity index 100%
rename from docker/authproxy/README.md
rename to docker/OpenResty-Orthanc-Keycloak/README.md
diff --git a/docker/authproxy/config/nginx.conf b/docker/OpenResty-Orthanc-Keycloak/config/nginx.conf
similarity index 100%
rename from docker/authproxy/config/nginx.conf
rename to docker/OpenResty-Orthanc-Keycloak/config/nginx.conf
diff --git a/docker/authproxy/config/orthanc.json b/docker/OpenResty-Orthanc-Keycloak/config/orthanc.json
similarity index 100%
rename from docker/authproxy/config/orthanc.json
rename to docker/OpenResty-Orthanc-Keycloak/config/orthanc.json
diff --git a/docker/authproxy/keycloak-nginx.yml b/docker/OpenResty-Orthanc-Keycloak/docker-compose.yml
similarity index 69%
rename from docker/authproxy/keycloak-nginx.yml
rename to docker/OpenResty-Orthanc-Keycloak/docker-compose.yml
index 07eab3707..b0a2fa274 100644
--- a/docker/authproxy/keycloak-nginx.yml
+++ b/docker/OpenResty-Orthanc-Keycloak/docker-compose.yml
@@ -5,19 +5,25 @@ version: '3.5'
 services:
   # Exposed server that's handling incoming web requests
   # Underlying image: openresty/openresty:alpine-fat
-  authproxy:
-    image: authproxy:latest
-    container_name: authproxy
+  ohif_viewer:
+    #
+    #
+    build:
+      # Project root
+      context: ./../../
+      dockerfile: ./docker/OpenResty-Orthanc-Keycloak/dockerfile
+      # image: authproxy:latest
+    #
+    #
+    image: webapp:latest
+    container_name: webapp
     restart: on-failure
     volumes:
       # Nginx config
-      # - ./config/nginx.conf:/etc/nginx.conf:ro
       - ./config/nginx.conf:/usr/local/openresty/nginx/conf/nginx.conf:ro
-      # Nginx static html
-      # - ./html/:/usr/share/nginx/html
       # Access Log
       - ./access.log:/var/log/nginx/test.com.access.log
-      #     # Let's Encrypt
+      # Let's Encrypt
       # - letsencrypt_certificates:/etc/letsencrypt
       # - letsencrypt_challenges:/var/www/letsencrypt
     ports:
@@ -29,6 +35,27 @@ services:
       - orthanc
       - keycloak
 
+  # authproxy:
+  # image: authproxy:latest
+  # container_name: authproxy
+  # restart: on-failure
+  # volumes:
+  #   # Nginx config
+  #   - ./config/nginx.conf:/usr/local/openresty/nginx/conf/nginx.conf:ro
+  #   # Access Log
+  #   - ./access.log:/var/log/nginx/test.com.access.log
+  #   # Let's Encrypt
+  #   # - letsencrypt_certificates:/etc/letsencrypt
+  #   # - letsencrypt_challenges:/var/www/letsencrypt
+  # ports:
+  #   # HOST_PORT:CONTAINER_PORT
+  #   # EXTERNAL:INTERNAL
+  #   - '443:443' # SSL
+  #   - '80:80' # Web
+  # depends_on:
+  #   - orthanc
+  #   - keycloak
+
   # Our image archive (PACS)
   # A client protected by keycloak
   # authenticated reverse proxy via `authproxy`
@@ -47,7 +74,7 @@ services:
     image: postgres:11.2
     volumes:
       # Should maybe be /var/lib/postgresql/data
-      - ./keycloak_postgres_data:/var/lib/postgresql
+      - ./volumes/keycloak_postgres_data:/var/lib/postgresql
     environment:
       POSTGRES_DB: keycloak
       POSTGRES_USER: keycloak
diff --git a/dockerfile b/docker/OpenResty-Orthanc-Keycloak/dockerfile
similarity index 100%
rename from dockerfile
rename to docker/OpenResty-Orthanc-Keycloak/dockerfile