diff --git a/docker-compose_idhub-temp.yml b/docker-compose_idhub-temp.yml
index 1d0d274..48d8b71 100644
--- a/docker-compose_idhub-temp.yml
+++ b/docker-compose_idhub-temp.yml
@@ -24,3 +24,5 @@ services:
       - EMAIL_BACKEND=${IDHUB_EMAIL_BACKEND}
     ports:
       - 7000:7000
+    volumes:
+      - ./IdHub:/opt/idhub
diff --git a/docker/idhub.Dockerfile b/docker/idhub.Dockerfile
index 40b9490..de6bddd 100644
--- a/docker/idhub.Dockerfile
+++ b/docker/idhub.Dockerfile
@@ -6,12 +6,12 @@ RUN apt update &&  apt-get install -y \
     python3-dev \
     python-is-python3
 
-WORKDIR /home
+WORKDIR /opt/idhub
 
 RUN python3 -m pip install --upgrade pip
 
-COPY IdHub .
-RUN pip install -r requirements.txt
+COPY IdHub/requirements.txt /
+RUN pip install -r /requirements.txt
 
-COPY docker/idhub.entrypoint.sh .
-ENTRYPOINT sh ./idhub.entrypoint.sh
+COPY docker/idhub.entrypoint.sh /
+ENTRYPOINT sh /idhub.entrypoint.sh
diff --git a/docker/idhub.entrypoint.sh b/docker/idhub.entrypoint.sh
index 62b444f..2e70c72 100755
--- a/docker/idhub.entrypoint.sh
+++ b/docker/idhub.entrypoint.sh
@@ -5,25 +5,45 @@ set -u
 set -x
 
 main() {
-        # go to the same path as the script
-        cd "$(dirname ${0})"
+        idhub_dir='/opt/idhub'
+        cd "${idhub_dir}"
 
-        # move the migrate thing in docker entrypoint
-        #   inspired by https://medium.com/analytics-vidhya/django-with-docker-and-docker-compose-python-part-2-8415976470cc
-        ./manage.py migrate
+        if [ ! -f "./manage.py" ]; then
+                cat <<END
+ERROR: you need to map your idhub git repo volume to docker, suggested volume mapping is:
+
+    volumes:
+      - ./IdHub:/opt/idhub
+END
+
+                exit 1
+        fi
+
+        # detect if existing deployment
+        if [ -f "${idhub_dir}/db.sqlite3" ]; then
+                echo "INFO: detected EXISTING deployment"
+                ./manage.py makemigrations
+                ./manage.py migrate
+        else
+                # move the migrate thing in docker entrypoint
+                #   inspired by https://medium.com/analytics-vidhya/django-with-docker-and-docker-compose-python-part-2-8415976470cc
+                echo "INFO detected NEW deployment"
+                ./manage.py migrate
+
+                if [ "${DEPLOYMENT}" = 'DEVELOPMENT' ]; then
+                        printf "This is DEVELOPMENT DEPLOYMENT: including demo hardcoded data\n  creating initial Datas\n" >&2
+                        ./manage.py initial_datas
+                else
+                        printf "creating superuser \n  user: ${DJANGO_SUPERUSER_USERNAME}\n  password: ${DJANGO_SUPERUSER_PASSWORD}\n  email: ${DJANGO_SUPERUSER_EMAIL}\n" >&2
+                        ## thanks https://stackoverflow.com/questions/6244382/how-to-automate-createsuperuser-on-django/59467533#59467533
+                        ./manage.py createsuperuser --no-input
+                fi
+        fi
 
         # enable dev flags when DEVELOPMENT deployment
         if [ "${DEPLOYMENT}" = 'DEVELOPMENT' ]; then
                 export DEBUG=True
                 export DEVELOPMENT=True
-
-                printf "This is DEVELOPMENT DEPLOYMENT: including demo hardcoded data\n  creating initial Datas\n" >&2
-                ./manage.py initial_datas
-
-        else
-                printf "creating superuser \n  user: ${DJANGO_SUPERUSER_USERNAME}\n  password: ${DJANGO_SUPERUSER_PASSWORD}\n  email: ${DJANGO_SUPERUSER_EMAIL}\n" >&2
-                ## thanks https://stackoverflow.com/questions/6244382/how-to-automate-createsuperuser-on-django/59467533#59467533
-                ./manage.py createsuperuser --no-input
         fi
 
         #./manage.py collectstatic