diff --git a/docker-compose-apps.dev.yaml b/docker-compose-apps.dev.yaml
index 9f8a967..1d76550 100644
--- a/docker-compose-apps.dev.yaml
+++ b/docker-compose-apps.dev.yaml
@@ -7,11 +7,11 @@ services:
 
   rhodecode:
     volumes:
-      - /media/psf/Home/workspace/rhodecode-vcsserver:/home/rhodecode/rhodecode-vcsserver:delegated
-      - /media/psf/Home/workspace/rhodecode-enterprise-ce:/home/rhodecode/rhodecode-enterprise-ce:delegated
-      - /media/psf/Home/workspace/rhodecode-enterprise-ee:/home/rhodecode/rhodecode-enterprise-ee:delegated
-      - /media/psf/Home/workspace/rhodecode-tools-ce:/home/rhodecode/rhodecode-tools-ce:delegated
-      - /media/psf/Home/workspace:/var/opt/rhodecode_repo_store:delegated
+      - $WORKSPACE_HOME/rhodecode-vcsserver:/home/rhodecode/rhodecode-vcsserver:delegated
+      - $WORKSPACE_HOME/rhodecode-enterprise-ce:/home/rhodecode/rhodecode-enterprise-ce:delegated
+      - $WORKSPACE_HOME/rhodecode-enterprise-ee:/home/rhodecode/rhodecode-enterprise-ee:delegated
+      - $WORKSPACE_HOME/rhodecode-tools-ce:/home/rhodecode/rhodecode-tools-ce:delegated
+      - $WORKSPACE_HOME:/var/opt/rhodecode_repo_store:delegated
       - nixstore:/opt/nix/store
       - pipcache:/home/rhodecode/.cache/pip
       # shared TMP dir
@@ -22,11 +22,11 @@ services:
 
   vcsserver:
     volumes:
-      - /media/psf/Home/workspace/rhodecode-vcsserver:/home/rhodecode/rhodecode-vcsserver:delegated
-      - /media/psf/Home/workspace/rhodecode-enterprise-ce:/home/rhodecode/rhodecode-enterprise-ce:delegated
-      - /media/psf/Home/workspace/rhodecode-enterprise-ee:/home/rhodecode/rhodecode-enterprise-ee:delegated
-      - /media/psf/Home/workspace/rhodecode-tools-ce:/home/rhodecode/rhodecode-tools-ce:delegated
-      - /media/psf/Home/workspace:/var/opt/rhodecode_repo_store:delegated
+      - $WORKSPACE_HOME/rhodecode-vcsserver:/home/rhodecode/rhodecode-vcsserver:delegated
+      - $WORKSPACE_HOME/rhodecode-enterprise-ce:/home/rhodecode/rhodecode-enterprise-ce:delegated
+      - $WORKSPACE_HOME/rhodecode-enterprise-ee:/home/rhodecode/rhodecode-enterprise-ee:delegated
+      - $WORKSPACE_HOME/rhodecode-tools-ce:/home/rhodecode/rhodecode-tools-ce:delegated
+      - $WORKSPACE_HOME:/var/opt/rhodecode_repo_store:delegated
       - nixstore:/opt/nix/store
       - pipcache:/home/rhodecode/.cache/pip
       # shared TMP dir
@@ -37,9 +37,9 @@ services:
 
   celery:
     volumes:
-      - /media/psf/Home/workspace/rhodecode-vcsserver:/home/rhodecode/rhodecode-vcsserver:delegated
-      - /media/psf/Home/workspace/rhodecode-enterprise-ce:/home/rhodecode/rhodecode-enterprise-ce:delegated
-      - /media/psf/Home/workspace/rhodecode-enterprise-ee:/home/rhodecode/rhodecode-enterprise-ee:delegated
+      - $WORKSPACE_HOME/rhodecode-vcsserver:/home/rhodecode/rhodecode-vcsserver:delegated
+      - $WORKSPACE_HOME/rhodecode-enterprise-ce:/home/rhodecode/rhodecode-enterprise-ce:delegated
+      - $WORKSPACE_HOME/rhodecode-enterprise-ee:/home/rhodecode/rhodecode-enterprise-ee:delegated
       - nixstore:/opt/nix/store
       - pipcache:/home/rhodecode/.cache/pip
       # shared TMP dir
@@ -47,9 +47,9 @@ services:
 
   celery-beat:
     volumes:
-      - /media/psf/Home/workspace/rhodecode-vcsserver:/home/rhodecode/rhodecode-vcsserver:delegated
-      - /media/psf/Home/workspace/rhodecode-enterprise-ce:/home/rhodecode/rhodecode-enterprise-ce:delegated
-      - /media/psf/Home/workspace/rhodecode-enterprise-ee:/home/rhodecode/rhodecode-enterprise-ee:delegated
+      - $WORKSPACE_HOME/rhodecode-vcsserver:/home/rhodecode/rhodecode-vcsserver:delegated
+      - $WORKSPACE_HOME/rhodecode-enterprise-ce:/home/rhodecode/rhodecode-enterprise-ce:delegated
+      - $WORKSPACE_HOME/rhodecode-enterprise-ee:/home/rhodecode/rhodecode-enterprise-ee:delegated
       - nixstore:/opt/nix/store
       - pipcache:/home/rhodecode/.cache/pip
       # shared TMP dir
@@ -57,10 +57,10 @@ services:
 
   svn:
     volumes:
-      - /media/psf/Home/workspace/rhodecode-vcsserver:/home/rhodecode/rhodecode-vcsserver:delegated
-      - /media/psf/Home/workspace/rhodecode-enterprise-ce:/home/rhodecode/rhodecode-enterprise-ce:delegated
-      - /media/psf/Home/workspace/rhodecode-enterprise-ee:/home/rhodecode/rhodecode-enterprise-ee:delegated
-      - /media/psf/Home/workspace:/var/opt/rhodecode_repo_store:delegated
+      - $WORKSPACE_HOME/rhodecode-vcsserver:/home/rhodecode/rhodecode-vcsserver:delegated
+      - $WORKSPACE_HOME/rhodecode-enterprise-ce:/home/rhodecode/rhodecode-enterprise-ce:delegated
+      - $WORKSPACE_HOME/rhodecode-enterprise-ee:/home/rhodecode/rhodecode-enterprise-ee:delegated
+      - $WORKSPACE_HOME:/var/opt/rhodecode_repo_store:delegated
       - nixstore:/opt/nix/store
       - pipcache:/home/rhodecode/.cache/pip
       # shared TMP dir
@@ -68,10 +68,10 @@ services:
 
   sshd:
     volumes:
-      - /media/psf/Home/workspace/rhodecode-vcsserver:/home/rhodecode/rhodecode-vcsserver:delegated
-      - /media/psf/Home/workspace/rhodecode-enterprise-ce:/home/rhodecode/rhodecode-enterprise-ce:delegated
-      - /media/psf/Home/workspace/rhodecode-enterprise-ee:/home/rhodecode/rhodecode-enterprise-ee:delegated
-      - /media/psf/Home/workspace:/var/opt/rhodecode_repo_store:delegated
+      - $WORKSPACE_HOME/rhodecode-vcsserver:/home/rhodecode/rhodecode-vcsserver:delegated
+      - $WORKSPACE_HOME/rhodecode-enterprise-ce:/home/rhodecode/rhodecode-enterprise-ce:delegated
+      - $WORKSPACE_HOME/rhodecode-enterprise-ee:/home/rhodecode/rhodecode-enterprise-ee:delegated
+      - $WORKSPACE_HOME:/var/opt/rhodecode_repo_store:delegated
       - nixstore:/opt/nix/store
       - pipcache:/home/rhodecode/.cache/pip
       # shared TMP dir
diff --git a/docker-compose-services.yaml b/docker-compose-services.yaml
index 31d1fe6..d082179 100644
--- a/docker-compose-services.yaml
+++ b/docker-compose-services.yaml
@@ -108,7 +108,7 @@ services:
       - "traefik.enable=true"
       - "traefik.http.routers.nginx.entrypoints=http"
       - "traefik.http.routers.nginx.priority=40"
-      - "traefik.http.routers.nginx.rule=Host(`${RC_HOSTNAME:?must-specify-rhodecode-hostname}`) && PathPrefix(`/_static/rhodecode`)"
+      - "traefik.http.routers.nginx.rule=Host(`${RC_HOSTNAME:?must-specify-rhodecode-hostname}`) && PathPrefix(`/_static/rhodecode`, `/_pages`)"
       - "traefik.http.routers.nginx.service=nginx-serv"
       - "traefik.http.services.nginx-serv.loadbalancer.server.port=80"
 
diff --git a/docs/build-new-image.md b/docs/source/builds/build-new-image.rst
similarity index 100%
rename from docs/build-new-image.md
rename to docs/source/builds/build-new-image.rst
diff --git a/docs/building-images.md b/docs/source/builds/building-images.rst
similarity index 100%
rename from docs/building-images.md
rename to docs/source/builds/building-images.rst
diff --git a/docs/ssl-enable.md b/docs/source/configuration/enable-ssl-on-traefik.rst
similarity index 100%
rename from docs/ssl-enable.md
rename to docs/source/configuration/enable-ssl-on-traefik.rst
diff --git a/docs/migration-to-docker.md b/docs/source/migration/migration-to-docker.rst
similarity index 100%
rename from docs/migration-to-docker.md
rename to docs/source/migration/migration-to-docker.rst