diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index f2fd4b855..e384ea9b8 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -15,9 +15,9 @@ values =
 	beta
 	stable
 
-[bumpversion:file:docs/installation/docker-compose.md]
+[bumpversion:file:website/docs/installation/docker-compose.md]
 
-[bumpversion:file:docs/installation/kubernetes.md]
+[bumpversion:file:website/docs/installation/kubernetes.md]
 
 [bumpversion:file:docker-compose.yml]
 
diff --git a/.coveragerc b/.coveragerc
index e211a4f1f..01241f2d7 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -6,7 +6,7 @@ omit =
     manage.py
     */migrations/*
     */apps.py
-    docs/
+    website/
 
 [report]
 sort = Cover
diff --git a/README.md b/README.md
index e0eb6083b..ff5e0d3c1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<img src="docs/images/logo.svg" height="50" alt="passbook logo"><img src="docs/images/brand_inverted.svg" height="50" alt="passbook">
+<img src="website/static/img/logo.svg" height="50" alt="passbook logo"><img src="website/static/img/brand_inverted.svg" height="50" alt="passbook">
 
 [![CI Build status](https://img.shields.io/azure-devops/build/beryjuorg/passbook/1?style=flat-square)](https://dev.azure.com/beryjuorg/passbook/_build?definitionId=1)
 ![Tests](https://img.shields.io/azure-devops/tests/beryjuorg/passbook/1?compact_message&style=flat-square)
@@ -13,14 +13,14 @@ passbook is an open-source Identity Provider focused on flexibility and versatil
 
 ## Installation
 
-For small/test setups it is recommended to use docker-compose, see the [documentation](https://passbook.beryju.org/docs/installation/docker-compose/)
+For small/test setups it is recommended to use docker-compose, see the [documentation](https://passbook.beryju.org/website/docs/installation/docker-compose/)
 
-For bigger setups, there is a Helm Chart in the `helm/` directory. This is documented [here](https://passbook.beryju.org/docs/installation/kubernetes/)
+For bigger setups, there is a Helm Chart in the `helm/` directory. This is documented [here](https://passbook.beryju.org/website/docs/installation/kubernetes/)
 
 ## Screenshots
 
-![](docs/images/screen_apps.png)
-![](docs/images/screen_admin.png)
+![](website/static/img/screen_apps.png)
+![](website/static/img/screen_admin.png)
 
 ## Development
 
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
index c872fdf91..4a6a2b0c3 100644
--- a/helm/Chart.yaml
+++ b/helm/Chart.yaml
@@ -5,7 +5,7 @@ home: https://passbook.beryju.org
 sources:
   - https://github.com/BeryJu/passbook
 version: "0.12.10-stable"
-icon: https://raw.githubusercontent.com/BeryJu/passbook/master/docs/images/logo.svg
+icon: https://raw.githubusercontent.com/BeryJu/passbook/master/website/static/img/logo.svg
 dependencies:
   - name: postgresql
     version: 9.4.1
diff --git a/passbook/lib/default.yml b/passbook/lib/default.yml
index f23cb4f47..c06f55b3c 100644
--- a/passbook/lib/default.yml
+++ b/passbook/lib/default.yml
@@ -31,5 +31,5 @@ passbook:
   footer_links:
     - name: Documentation
       href: https://passbook.beryju.org/docs/
-    #  - name: test
-    #    href: https://test
+    - name: passbook Website
+      href: https://passbook.beryju.org/
diff --git a/passbook/lib/expression/evaluator.py b/passbook/lib/expression/evaluator.py
index 03f847aa1..c564e55da 100644
--- a/passbook/lib/expression/evaluator.py
+++ b/passbook/lib/expression/evaluator.py
@@ -27,7 +27,7 @@ class BaseEvaluator:
 
     def __init__(self):
         # update passbook/policies/expression/templates/policy/expression/form.html
-        # update docs/policies/expression/index.md
+        # update website/docs/policies/expression.md
         self._globals = {
             "regex_match": BaseEvaluator.expr_filter_regex_match,
             "regex_replace": BaseEvaluator.expr_filter_regex_replace,
diff --git a/passbook/policies/expression/evaluator.py b/passbook/policies/expression/evaluator.py
index dcbb8e6a6..5d861d9b6 100644
--- a/passbook/policies/expression/evaluator.py
+++ b/passbook/policies/expression/evaluator.py
@@ -32,7 +32,7 @@ class PolicyEvaluator(BaseEvaluator):
 
     def set_policy_request(self, request: PolicyRequest):
         """Update context based on policy request (if http request is given, update that too)"""
-        # update docs/policies/expression/index.md
+        # update website/docs/policies/expression.md
         self._context["pb_is_sso_flow"] = request.context.get(PLAN_CONTEXT_SSO, False)
         if request.http_request:
             self.set_http_request(request.http_request)
@@ -41,7 +41,7 @@ class PolicyEvaluator(BaseEvaluator):
 
     def set_http_request(self, request: HttpRequest):
         """Update context based on http request"""
-        # update docs/policies/expression/index.md
+        # update website/docs/policies/expression.md
         self._context["pb_client_ip"] = ip_address(
             get_client_ip(request) or "255.255.255.255"
         )