diff --git a/app/apps/core/migrations/0012_initial_data.py b/app/apps/core/migrations/0012_initial_data.py
new file mode 100644
index 0000000000000000000000000000000000000000..3e735f3877488592d6c80778409c429bdc172cf3
--- /dev/null
+++ b/app/apps/core/migrations/0012_initial_data.py
@@ -0,0 +1,21 @@
+
+# Generated by Django 2.1.4 on 2018-12-17 10:58
+
+from django.db import migrations
+
+def initial_data(apps, schema_editor):
+    TARGET_DOCUMENT = 1  # Note: not dry because get_model only get fields not consts
+    TARGET_PART = 2
+    Typology = apps.get_model('core', 'Typology')
+    Typology.objects.create(name='Manuscript', target=TARGET_DOCUMENT)
+    Typology.objects.create(name='Page', target=TARGET_PART)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('core', '0011_auto_20181212_1730'),
+    ]
+    
+    operations = [
+        migrations.RunPython(initial_data),
+    ]
diff --git a/app/entrypoint.sh b/app/entrypoint.sh
index a7021d03453af365c98dbc1ed55729b86201091b..7ee4d3c6f45ce731ce1d8c2afd443b2c23bdf6e8 100755
--- a/app/entrypoint.sh
+++ b/app/entrypoint.sh
@@ -1,17 +1,12 @@
 #!/bin/sh
 
-if [ "$DATABASE" = "postgres" ]
-then
-    echo "Waiting for postgres..."
 
-    while ! nc -z $SQL_HOST $SQL_PORT; do
-      sleep 0.1
-    done
+echo "Waiting for postgres..."
+while ! nc -z $SQL_HOST $SQL_PORT; do
+    sleep 0.1
+done
+echo "PostgreSQL started"
 
-    echo "PostgreSQL started"
-fi
-
-python manage.py flush --no-input
 python manage.py migrate
 
 # static files
diff --git a/app/escriptorium/settings.py b/app/escriptorium/settings.py
index 9831772bf037b01582f04beaefdbebc9207f20c6..5f2dc68c57c02c02981e070ec29043721fabf6af 100644
--- a/app/escriptorium/settings.py
+++ b/app/escriptorium/settings.py
@@ -88,9 +88,9 @@ WSGI_APPLICATION = 'escriptorium.wsgi.application'
 DATABASES = {
     'default': {
         'ENGINE': os.getenv('SQL_ENGINE', 'django.db.backends.postgresql'),
-        'NAME': os.getenv('SQL_DATABASE', os.path.join(BASE_DIR, 'escriptorium')),
-        'USER': os.getenv('SQL_USER', 'postgres'),
-        'PASSWORD': os.getenv('SQL_PASSWORD', 'postgres'),
+        'NAME': os.getenv('POSTGRES_DB', os.path.join(BASE_DIR, 'escriptorium')),
+        'USER': os.getenv('POSTGRES_USER', 'postgres'),
+        'PASSWORD': os.getenv('POSTGRES_PASSWORD', 'postgres'),
         'HOST': os.getenv('SQL_HOST', 'localhost'),
         'PORT': os.getenv('SQL_PORT', '5432'),
     }
diff --git a/app/escriptorium/templates/core/document_form.html b/app/escriptorium/templates/core/document_form.html
index 62121348afb85791d3fc3ea347362226d932f9c4..323dd93624de0a3ebfbb65456ff7f48b8e75ae3e 100644
--- a/app/escriptorium/templates/core/document_form.html
+++ b/app/escriptorium/templates/core/document_form.html
@@ -107,7 +107,7 @@
           </form>
           
           <a data-toggle="collapse" href="#advancedForm" role="button" aria-expanded="false" aria-controls="collapseForm">
-            {% trans "Show advanced form" %}
+            {% trans "Show advanced options" %}
           </a>
           <div class="card">
             <div id="advancedForm" class="collapse" aria-labelledby="headingOne" data>
@@ -207,6 +207,7 @@
 <script src="{% static 'js/document_form.js' %}"></script>
 <script src="{% static 'js/image_cards.js' %}"></script>
 <script src="{% static 'js/lazyload.js' %}"></script>
+{% if object %}
 <script type="text/javascript">
 'use strict';
 var processDocumentPartsUrl = "{% url 'document-parts-process' pk=object.pk %}";
@@ -234,4 +235,5 @@ $(document).ready(function() {
     {% endfor %}
 });
 </script>
+{% endif %}
 {% endblock %}
diff --git a/docker-compose.yml b/docker-compose.yml
index 8c9049f9a74ba926415658669dc367da5d594fb1..50f2b8b5f2764bcdd81779e5e7b55d8f606325b6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   web: &web
     build:
       context: ./app
-    env_file: .env
+    env_file: variables.env
     command: uwsgi --ini /usr/src/app/uwsgi.ini
     volumes:
       - ./app/:/usr/src/app/
@@ -28,7 +28,7 @@ services:
     image: postgres:10.5-alpine
     volumes:
       - postgres_data:/var/lib/postgresql/data/
-    env_file: .env
+    env_file: variables.env
 
   redis:
     image: redis:3.0-alpine
@@ -65,7 +65,7 @@ services:
   celeryworker:
     build:
       context: ./app
-    env_file: .env
+    env_file: variables.env
     depends_on:
       - db
       - redis
@@ -77,7 +77,7 @@ services:
   celerybeat:
     build:
       context: ./app
-    env_file: .env
+    env_file: variables.env
     depends_on:
       - db
       - redis
diff --git a/variables.env b/variables.env
new file mode 100644
index 0000000000000000000000000000000000000000..da18e7dcd95d38d680f814b20a65f0935210dcbc
--- /dev/null
+++ b/variables.env
@@ -0,0 +1,13 @@
+DEBUG=True
+SECRET_KEY=whatever
+SQL_ENGINE=django.db.backends.postgresql
+SQL_HOST=db
+SQL_PORT=5432
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres
+POSTGRES_DB=escriptorium
+DJANGO_SU_NAME=admin
+DJANGO_SU_EMAIL=admin@admin.com
+DJANGO_SU_PASSWORD=admin
+DJANGO_SETTINGS_MODULE=escriptorium.settings
+REDIS_HOST=redis
\ No newline at end of file
diff --git a/.env_example b/variables.env_example
similarity index 100%
rename from .env_example
rename to variables.env_example