diff --git a/README.md b/README.md
index b0ac841ce..8b1fbea41 100644
--- a/README.md
+++ b/README.md
@@ -46,8 +46,8 @@ The following environment variables are also honored for configuring your UXBOX
 
 #### Backend
 -	`-e UXBOX_HTTP_SERVER_DEBUG=...` (defaults to false)
--	`-e UXBOX_MEDIA_BASEURI=...` (defaults to http://localhost:6060/media/)
--	`-e UXBOX_STATIC_BASEURI=...` (defaults to http://localhost:6060/static/)
+-	`-e UXBOX_MEDIA_URI=...` (defaults to http://localhost:6060/media/)
+-	`-e UXBOX_ASSETS_URI=...` (defaults to http://localhost:6060/static/)
 -	`-e UXBOX_DATABASE_USERNAME="..."` (defaults to uxbox)
 -	`-e UXBOX_DATABASE_PASSWORD="..."` (defaults to youshouldoverwritethiswithsomethingelse)
 -	`-e UXBOX_DATABASE_NAME="..."` (defaults to uxbox)
diff --git a/backend/Dockerfile b/backend/Dockerfile
index b492ed3ed..940e4261d 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -21,8 +21,8 @@ COPY --from=0 /home/uxbox/backend/dist/uxbox-backend.jar /srv/uxbox/app.jar
 COPY --from=0 /home/uxbox/backend/docker-entrypoint.sh /entrypoint.sh
 
 ENV UXBOX_HTTP_SERVER_DEBUG=false \
-    UXBOX_MEDIA_BASEURI="http://localhost:6060/media/" \
-    UXBOX_STATIC_BASEURI="http://localhost:6060/static/" \
+    UXBOX_MEDIA_URI="http://localhost:6060/media/" \
+    UXBOX_ASSETS_URI="http://localhost:6060/static/" \
     UXBOX_DATABASE_USERNAME="uxbox" \
     UXBOX_DATABASE_PASSWORD="youshouldoverwritethiswithsomethingelse" \
     UXBOX_DATABASE_NAME="uxbox" \
diff --git a/backend/resources/config/default.edn b/backend/resources/config/default.edn
index 29e4c2a36..452d7503b 100644
--- a/backend/resources/config/default.edn
+++ b/backend/resources/config/default.edn
@@ -2,6 +2,11 @@
  ;; WARNING: this is a default secret key and
  ;; it should be overwritten in production env.
  :secret "5qjiAn-QUpawUNqGP10UZKklSqbLKcdGY3sJpq0UUACpVXGg2HOFJCBejDWVHskhRyp7iHb4rjOLXX2ZjF-5cw"
+ 
+ :registration
+ {
+  :enabled true}
+ 
  :smtp
  {:host "localhost" ;; Hostname of the desired SMTP server.
   :port 25          ;; Port of SMTP server.
@@ -15,19 +20,20 @@
  :auth-options {:alg :a256kw :enc :a128cbc-hs256}
 
  :email {:reply-to "no-reply@uxbox.io"
-         :from "no-reply@uxbox.io"}
+         :from "no-reply@uxbox.io"
+         :support "support@uxbox.io"}
 
  :http {:port 6060
         :max-body-size 52428800
         :debug true}
 
  :media
- {:basedir "resources/public/media"
-  :baseuri "http://localhost:6060/media/"}
+ {:directory "resources/public/media"
+  :uri "http://localhost:6060/media/"}
 
  :static
- {:basedir "resources/public/static"
-  :baseuri "http://localhost:6060/static/"}
+ {:directory "resources/public/static"
+  :uri "http://localhost:6060/static/"}
 
  :database
  {:adapter "postgresql"
diff --git a/backend/resources/config/test.edn b/backend/resources/config/test.edn
index 2ded91c1b..31bc83242 100644
--- a/backend/resources/config/test.edn
+++ b/backend/resources/config/test.edn
@@ -2,12 +2,12 @@
  {:verbose false}
 
  :media
- {:basedir "/tmp/uxbox/media"
-  :baseuri "http://localhost:6060/media/"}
+ {:directory "/tmp/uxbox/media"
+  :uri "http://localhost:6060/media/"}
 
  :static
- {:basedir "/tmp/uxbox/static"
-  :baseuri "http://localhost:6060/static/"}
+ {:directory "/tmp/uxbox/static"
+  :uri "http://localhost:6060/static/"}
 
  :database
  {:adapter "postgresql"
diff --git a/docker-compose.yml b/docker-compose.yml
index c9e93f8e7..039f5bf8c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -33,8 +33,10 @@ services:
         environment:
             # HTTP setup
             - UXBOX_HTTP_SERVER_DEBUG=false
-            - UXBOX_MEDIA_BASEURI=http://localhost:6060/media/
-            - UXBOX_STATIC_BASEURI=http://localhost:6060/static/
+            - UXBOX_MEDIA_URI="/media/"
+            #- UXBOX_MEDIA_URI="http://uxbox.io/media/"
+            - UXBOX_ASSETS_URI="/static/"
+            #- UXBOX_ASSETS_URI="http://uxbox.io/static/"
             # Database setup
             - UXBOX_DATABASE_USERNAME="uxbox"
             - UXBOX_DATABASE_PASSWORD="uxbox_postgres_password"
@@ -70,8 +72,8 @@ services:
         ports:
             - 80:80
         environment:
-            - "API_URL=http://localhost:6060/api/"
-            #- "API_URL=http://uxbox.io/api/"
+            - API_URL="http://localhost:6060/api/"
+            #- API_URL="http://uxbox.io/api/"
         volumes:
             #- /srv/uxbox/frontend/html:/usr/share/nginx/html
             - /srv/uxbox/backend/resources:/srv/uxbox/resources:ro