diff --git a/docker/dcm4che/docker-compose-dcm4che.env b/docker/Nginx-Dcm4che/docker-compose-dcm4che.env
similarity index 100%
rename from docker/dcm4che/docker-compose-dcm4che.env
rename to docker/Nginx-Dcm4che/docker-compose-dcm4che.env
diff --git a/docker/docker-compose-dcm4che.yml b/docker/Nginx-Dcm4che/docker-compose-dcm4che.yml
similarity index 100%
rename from docker/docker-compose-dcm4che.yml
rename to docker/Nginx-Dcm4che/docker-compose-dcm4che.yml
diff --git a/docker/dcm4che/etc/localtime b/docker/Nginx-Dcm4che/etc/localtime
similarity index 100%
rename from docker/dcm4che/etc/localtime
rename to docker/Nginx-Dcm4che/etc/localtime
diff --git a/docker/dcm4che/etc/timezone b/docker/Nginx-Dcm4che/etc/timezone
similarity index 100%
rename from docker/dcm4che/etc/timezone
rename to docker/Nginx-Dcm4che/etc/timezone
diff --git a/docker/nginx-proxy/conf/nginx.conf b/docker/Nginx-Dcm4che/nginx-proxy/conf/nginx.conf
similarity index 100%
rename from docker/nginx-proxy/conf/nginx.conf
rename to docker/Nginx-Dcm4che/nginx-proxy/conf/nginx.conf
diff --git a/docker/docker-compose-orthanc.yml b/docker/Nginx-Orthanc/docker-compose-orthanc.yml
similarity index 100%
rename from docker/docker-compose-orthanc.yml
rename to docker/Nginx-Orthanc/docker-compose-orthanc.yml
diff --git a/docker/docker-compose-publicserver.yml b/docker/Nginx/docker-compose-publicserver.yml
similarity index 100%
rename from docker/docker-compose-publicserver.yml
rename to docker/Nginx/docker-compose-publicserver.yml
diff --git a/docker/OpenResty-Orthanc-Keycloak/.env b/docker/OpenResty-Orthanc-Keycloak/.env
new file mode 100644
index 000000000..6989ff3fc
--- /dev/null
+++ b/docker/OpenResty-Orthanc-Keycloak/.env
@@ -0,0 +1,5 @@
+# Docker ENV and ARG Variables
+# ----------------------------
+# https://vsupalov.com/docker-arg-env-variable-guide/
+#
+#
diff --git a/docker/keycloak.yml b/docker/keycloak.yml
deleted file mode 100644
index f2f534e2c..000000000
--- a/docker/keycloak.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-version: '3.5'
-
-services:
-  keycloak_postgres:
-    hostname: keycloak-db
-    restart: always
-    image: postgres
-    volumes:
-      - ./keycloak_postgres_data:/var/lib/postgresql
-    environment:
-      POSTGRES_DB: keycloak
-      POSTGRES_USER: keycloak
-      POSTGRES_PASSWORD: password
-    dns:
-      - 8.8.8.8
-  keycloak:
-    hostname: keycloak
-    restart: always
-    image: jboss/keycloak:6.0.1
-    environment:
-      POSTGRES_PORT_5432_TCP_ADDR: keycloak_postgres
-      POSTGRES_DATABASE: keycloak
-      POSTGRES_USER: keycloak
-      POSTGRES_PASSWORD: password
-      KEYCLOAK_USER: admin
-      KEYCLOAK_PASSWORD: password
-      PROXY_ADDRESS_FORWARDING: 'true'
-    #    volumes:
-    #      - ./keycloak_data/themes:/opt/jboss/keycloak/themes
-    ports:
-      - 8080:8080
-    depends_on:
-      - keycloak_postgres
-    dns:
-      - 8.8.8.8
-    links:
-      - keycloak_postgres