diff --git a/roles/web-app-baserow/config/main.yml b/roles/web-app-baserow/config/main.yml
index 8dcfb7b4..fc5a911a 100644
--- a/roles/web-app-baserow/config/main.yml
+++ b/roles/web-app-baserow/config/main.yml
@@ -7,9 +7,9 @@ features:
 docker:
   services:
     redis:
-      enabled:          true
+      enabled:            true
     database:
-      enabled:          true
+      enabled:            true
     baserow:  
       backup:
         no_stop_required: true
@@ -17,8 +17,19 @@ docker:
       version:            "latest"
       name:               "baserow"
   volumes:
-    data:               "baserow_data"
+    data:                 "baserow_data"
 server:
   domains:
     canonical:
       - baserow.{{ PRIMARY_DOMAIN }}
+  csp:
+    whitelist:
+      worker-src:
+        - "blob:"
+      connect-src:
+        - "https://sentry.com/"
+    flags:
+      script-src-elem:
+        unsafe-inline:  true
+      style-src:
+        unsafe-inline:  true
\ No newline at end of file
diff --git a/roles/web-app-baserow/templates/docker-compose.yml.j2 b/roles/web-app-baserow/templates/docker-compose.yml.j2
index c493877c..d5c04e3f 100644
--- a/roles/web-app-baserow/templates/docker-compose.yml.j2
+++ b/roles/web-app-baserow/templates/docker-compose.yml.j2
@@ -2,8 +2,8 @@
 
   application:
 {% include 'roles/docker-container/templates/base.yml.j2' %}
-    image: "{{ baserow_image }}:{{ baserow_version }}"
-    container_name: {{ baserow_name }}
+    image: "{{ BASEROW_IMAGE }}:{{ BASEROW_VERSION }}"
+    container_name: {{ BASEROW_CONTAINER }}
     volumes:
       - data:/baserow/data
     ports:
@@ -13,6 +13,6 @@
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
   data:
-    name: {{ baserow_volume }}
+    name: {{ BASEROW_VOLUME }}
 
 {% include 'roles/docker-compose/templates/networks.yml.j2' %}
\ No newline at end of file
diff --git a/roles/web-app-baserow/templates/env.j2 b/roles/web-app-baserow/templates/env.j2
index bbb36767..b5124419 100644
--- a/roles/web-app-baserow/templates/env.j2
+++ b/roles/web-app-baserow/templates/env.j2
@@ -1,5 +1,8 @@
+# All Configuration Options:
+# https://baserow.io/docs/installation/configuration
+
 # Public URL
-BASEROW_PUBLIC_URL={{ domains | get_url(application_id, WEB_PROTOCOL) }}
+BASEROW_PUBLIC_URL={{ BASEROW_PUBLIC_URL }}
 
 # Email Server Configuration
 EMAIL_SMTP={{ SYSTEM_EMAIL.SMTP | upper }}
diff --git a/roles/web-app-baserow/vars/main.yml b/roles/web-app-baserow/vars/main.yml
index d29fd8de..a764b9da 100644
--- a/roles/web-app-baserow/vars/main.yml
+++ b/roles/web-app-baserow/vars/main.yml
@@ -1,7 +1,11 @@
+# General
 application_id:     "web-app-baserow"
-database_password:  "{{ applications | get_app_conf(application_id, 'credentials.database_password', True) }}"
+database_password:  "{{ applications | get_app_conf(application_id, 'credentials.database_password') }}"
 database_type:      "postgres"
-baserow_version:    "{{ applications | get_app_conf(application_id, 'docker.services.baserow.version', True) }}"
-baserow_image:      "{{ applications | get_app_conf(application_id, 'docker.services.baserow.image', True) }}"
-baserow_name:       "{{ applications | get_app_conf(application_id, 'docker.services.baserow.name', True) }}"
-baserow_volume:     "{{ applications | get_app_conf(application_id, 'docker.volumes.data', True) }}"
+
+# Baserow
+BASEROW_PUBLIC_URL: "{{ domains | get_url(application_id, WEB_PROTOCOL) }}"
+BASEROW_VERSION:    "{{ applications | get_app_conf(application_id, 'docker.services.baserow.version') }}"
+BASEROW_IMAGE:      "{{ applications | get_app_conf(application_id, 'docker.services.baserow.image') }}"
+BASEROW_CONTAINER:  "{{ applications | get_app_conf(application_id, 'docker.services.baserow.name') }}"
+BASEROW_VOLUME:     "{{ applications | get_app_conf(application_id, 'docker.volumes.data') }}"