diff --git a/docker-compose.production.yml b/docker-compose.production.yml
index 424fae50..fb8acc55 100644
--- a/docker-compose.production.yml
+++ b/docker-compose.production.yml
@@ -10,6 +10,10 @@ services:
     extends:
       file: docker-compose.shared.yml
       service: router
+    volumes:
+      - ./router/ssl/prod:/opt/ssl:ro
+      - vol-images:/opt/images:ro
+      - vol-client:/opt/client:ro
     ports:
       - "${APP_PORT}:443"
     restart: always
diff --git a/docker-compose.shared.yml b/docker-compose.shared.yml
index b334f4b9..a6e48a65 100644
--- a/docker-compose.shared.yml
+++ b/docker-compose.shared.yml
@@ -11,10 +11,6 @@ services:
     depends_on:
       - server
       - og-injector
-    volumes:
-      - ./.certs:/opt/ssl:ro
-      - vol-images:/opt/images:ro
-      - vol-client:/opt/client:ro
 
   server:
     build: ./server
diff --git a/docker-compose.yml b/docker-compose.yml
index 6ebf8363..6ad10235 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,6 +10,10 @@ services:
     extends:
       file: docker-compose.shared.yml
       service: router
+    volumes:
+      - ./router/ssl/dev:/opt/ssl:ro
+      - vol-images:/opt/images:ro
+      - vol-client:/opt/client:ro
     ports:
       - "${DEV_SERVER_PORT}:443"
 
@@ -31,7 +35,7 @@ services:
       service: client
     volumes:
       - ./client:/opt/client:rw
-      - ./.certs:/opt/ssl:ro
+      - ./router/ssl/dev:/opt/ssl:ro
       - vol-client:/opt/client/build:rw
     environment:
       HTTPS: true
diff --git a/.certs/current.crt b/router/ssl/dev/current.crt
similarity index 100%
rename from .certs/current.crt
rename to router/ssl/dev/current.crt
diff --git a/.certs/current.key b/router/ssl/dev/current.key
similarity index 100%
rename from .certs/current.key
rename to router/ssl/dev/current.key
diff --git a/router/ssl/prod/.keep b/router/ssl/prod/.keep
new file mode 100644
index 00000000..e69de29b