diff --git a/.env b/.env
index 4d17da5c..db5bef1f 100644
--- a/.env
+++ b/.env
@@ -1,9 +1,23 @@
 DB_NAME=biogenome-db
 DB_USER=biogenome-user
 DB_PASS=biogenome-password
-DB_HOST=mydatabase
+
+# declare production db host here
+# DB_PROD_HOST=
+
+# default dev db host
+DB_DEV_HOST=mydev-db
+
 DB_PORT=27017
+DB_DUMP=dump_2022-05-18.gz
 
+MONGO_INITDB_ROOT_USERNAME=root
+MONGO_INITDB_ROOT_PASSWORD=root
+MONGO_INITDB_DATABASE=admin
+MONGODB_DATA_DIR=/var/lib/mongodb-data
+MONDODB_LOG_DIR=/dev/null
+
+# change to 'production' or null in prod!!
 FLASK_ENV=development
 APP_NAME=RNAmaps
 API_PORT=80
@@ -14,6 +28,8 @@ THREADS=2
 USR=admin
 JWT_SECRET_KEY=secret_restKey 
 RESTKEY=secretPassword
+
+
 PROJECT_ACCESSION=PRJNA533106
 PROJECTS=DTOL, VGP
 EXEC_TIME=600
diff --git a/README.md b/README.md
index eb523352..2f7b1ca5 100644
--- a/README.md
+++ b/README.md
@@ -85,27 +85,31 @@ This project is built with the following stack:
 <!-- GETTING STARTED -->
 ## Getting Started
 
-Before building the application it is necessary to configure the .env file in the project's root directory:
-The .env file contains many parts that have to be configured depending on the needs:
+By default the portal is configured to retrieve public data under the EBP umbrella (https://www.earthbiogenome.org/) it will load (at building stage) and seed the database with the last dump (/dump-db directory)
 
-	The API KEY part:
-  	Configure this part if you want to enter samples locally
+If you want to customize the portal follow the steps below:
 
-	USER=admin --> Define the user name that will be inserted to access the admin area
-	JWT_SECRET_KEY=secret_restKey #change this in production!! --> key to encrypt the RESTKEY (below)
-	RESTKEY=secretPassword #change this in production!! --> password that will be inserted to access the admin area
+  General configurations:
+  - Set the ROOT_NODE env variable with the Taxon name you want to use as a root (default: Eukaryota)
+  
+  Public data management:
+  - in the .env file insert the PROJECT_ACCESSION (The INSDC BioProject accession) of the project you want to use as a root:
+      if the bioproject you want to use as a root is not under the EBP umbrella, you have to comment the volumes of the biogenome_mongo service in the docker-compose-dev file:
+                  - ./mongo-init.sh:/docker-entrypoint-initdb.d/mongo-init.sh
+                  - ./mongo-restore.sh:/docker-entrypoint-initdb.d/mongo-restore.sh
+                  - ./db-dump:/db-dump
+  - if the same project or sub projects are defined as attributes of the sample metadata (ex: project name: 'YOUR_PROJECT_NAME') submitted in INSDC, set the list of comma separated project names in the PROJECTS env variable (default values: VGP(https://vertebrategenomesproject.org/), DTOL(https://www.darwintreeoflife.org/)) 
+
+  -EXEC_TIME: how often, in seconds, the job should be performed it does nothing if PROJECTS OR PROJECT_ACCESSION are empty
 
-	The CRONJOB part:
-  Configure this part if you want to retrieve public data from ENA/BioSamples and/or NCBI (the sample metadata format must be compliant with the ENA checklist).
-	The cronjob will automatically check for read data in ENA if PROJECTS and/or PROJECT_ACCESSION are present
-	PROJECTS=  --> list of projects (comma separated) wich name figures in the sample metadata submitted to the ENA/BioSamples
-	PROJECT_ACCESSION --> bioproject accession to retrieve data from NCBI 
-	EXEC_TIME=600 --> how often, in seconds, the job should be performed
+  NOTE: if you are just interested in local data management remove the default values of PROJECTS and PROJECT_ACCESSION
 
-	The DATA PORTAL part:
-  	This part have some default values that can be modified
+  Local data management:
 
-    ROOT_NODE=the INSDC bioproject acccession which will be used as the root project of the application
+  Configure this part if you want to enter samples locally
+	USR=admin --> Define the user name that will be inserted to access the admin area
+	JWT_SECRET_KEY=secret_restKey #change this in production!! --> key to encrypt the RESTKEY (below)
+	RESTKEY=secretPassword #change this in production!! --> password that will be inserted to access the admin area
 
 
 To add a custom logo and an icon follow this steps:
@@ -129,12 +133,14 @@ To get a local copy up and running follow these simple example steps.
 
 ### Installation
 
-You need to have docker compose installed (https://docs.docker.com/compose/)
+You need to have docker compose installed (https://docs.docker.com/compose/). 
 
-1. Configure the .env file as above
-2. Run this command in the root directory:
-	sudo docker-compose -f docker-compose.yml up --build
-3. To start creating data go to: /admin from the home page and login
+1. Run this command in the root directory:
+	sudo docker-compose -f docker-compose.dev.yml up --build
+
+  This will load the last generated db dump containing all the public data under the EBP scope (https://www.earthbiogenome.org/)
+
+2. To start creating data go to: /admin from the home page and login
 
 
 <p align="right">(<a href="#top">back to top</a>)</p>
@@ -175,11 +181,10 @@ The import function uses the BioSamples API to retrieve samples metadata via the
 ## Roadmap
 
 - [ ] Add Changelog
-- [ ] Add JSON schema (OAS docs)
-- [X] Add local names management
-- [X] Add organism photo management
-- [X] Add sample accession import feature
-- [ ] Add custom fields management
+- [ ] Add API Documentation
+- [ ] Add tests (I know..)
+
+
 
 
 
diff --git a/client/src/App.vue b/client/src/App.vue
index d24784b1..efb27a30 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -4,6 +4,21 @@
     <b-overlay :show="loading">
     <b-container fluid class="router-container">
       <b-row>
+        <b-col lg="6">
+          <b-alert dismissible show variant="success">
+            <p>
+              This data portal is an instance of the <a href="https://github.com/guigolab/biogenome-portal" class="alert-link">BioGenome portal</a> software.
+            </p>
+            <p>
+              It tracks the <a href="https://www.insdc.org/" class="alert-link">INSDC</a> public data under the <a href="https://www.earthbiogenome.org/" class="alert-link">Earth BioGenome Project</a> umbrella.
+            </p>
+            <hr>
+            <p class="mb-0">
+              <strong>IMPORTANT</strong>: This is <strong>NOT</strong> the official data portal of the Earth BioGenome Project.
+              Refer to <a href="https://goat.genomehubs.org/" class="alert-link">GoaT</a> to view the Earth BioGenome Project sequencing progress.
+            </p>
+          </b-alert>
+        </b-col>
         <alert-component/>
       </b-row>
       <b-row>
@@ -25,7 +40,7 @@
 </template>
 
 <script>
-import {BOverlay} from 'bootstrap-vue'
+import {BOverlay,BAlert} from 'bootstrap-vue'
 import BreadCrumbComponent from './components/base/BreadCrumbComponent.vue';
 import NavBarComponent from './components/base/NavBarComponent.vue'
 import AlertComponent from './components/base/AlertComponent.vue';
@@ -42,6 +57,7 @@ components: {
   NavBarComponent,
   BreadCrumbComponent,
   BOverlay,
+  BAlert,
   AlertComponent,
   LoginModal,
   }
diff --git a/client/src/components/data/AnnotationsComponent.vue b/client/src/components/data/AnnotationsComponent.vue
index 7cf1c831..c9a295ca 100644
--- a/client/src/components/data/AnnotationsComponent.vue
+++ b/client/src/components/data/AnnotationsComponent.vue
@@ -1,21 +1,26 @@
 <template>
 <div ref="annotationsTable">
-  <table-component stacked :sticky-header="stickyHeader" :items="annotations">
+  <table-component stacked :sticky-header="stickyHeader" :items="annotations" :fields="fields">
     <template #cell(pageURL)="data">
-        <b-link class="no-underline" target="_blank" :href="data.value">Genome browser</b-link>
+        <b-link class="no-underline" target="_blank" :href="data.value">Open</b-link>
     </template>
     <template #cell(gffGzLocation)="data">
-        <b-link class="no-underline" target="_blank" :href="data.value">GFF3</b-link>
+        <b-link class="no-underline" target="_blank" :href="data.value">Download</b-link>
     </template>
         <template #cell(tabIndexLocation)="data">
-        <b-link class="no-underline" target="_blank" :href="data.value">GFF3 (Tabix)</b-link>
+        <b-link class="no-underline" target="_blank" :href="data.value">Download</b-link>
     </template>
-    <template #cell(targetGenome)="data">
+    <template #cell(assemblyAccession)="data">
         <b-link class="no-underline" target="_blank" :href="'https://www.ebi.ac.uk/ena/browser/view/' + data.value">{{data.value}}</b-link>
     </template>
     <template #cell(annotationSource)="data">
         <b-link class="no-underline" target="_blank" :href="data.value">{{data.value}}</b-link>
     </template>
+    <template #cell(evidenceSource)="data">
+        <div v-for="value in data.value.split('.')" :key="value">
+            {{value}}
+        </div>
+    </template>
 </table-component>
 </div>
 </template>
@@ -27,6 +32,20 @@ import TableComponent from '../base/TableComponent.vue'
 export default{
   components: { TableComponent,BLink },
   props: ['annotations'],
+  data(){
+      return {
+          fields:[
+              {key:'name', label: 'Name'},
+              {key:'gffGzLocation', label: 'GFF3 (.gz)'},
+              {key:'tabIndexLocation', label: 'GFF3 (gz.tbi)'},
+              {key:'pageURL', label: 'Genome Browser'},
+              {key:'annotationSource', label: 'Annotation Pipeline'},
+              {key:'evidenceSource', label: 'Evidence Source'},
+              {key:'targetGenome', label: 'Assembly Name'},
+              {key:'assemblyAccession', label: 'Assembly Accession'}
+          ]
+      }
+  }
 }
 </script>
 <style>
diff --git a/client/src/components/organism/OrganismFilterComponent.vue b/client/src/components/organism/OrganismFilterComponent.vue
index d59dedb9..2fdaa5a1 100644
--- a/client/src/components/organism/OrganismFilterComponent.vue
+++ b/client/src/components/organism/OrganismFilterComponent.vue
@@ -20,7 +20,7 @@
             <b-tooltip target="switch-description">
                Retrieve only selected data ex: retrieve <stong>only</stong> organisms with 'Submitted Samples' or <stong>only</stong> 'Submitted Samples' and 'Submitted Assemblies'
             </b-tooltip>
-            <b-form-checkbox-group :options="checkboxOptions" v-model="selectedCheckboxes"/>
+            <b-form-checkbox-group :options="checkboxOptions" v-model="selectedData"/>
             <b-icon-arrow-clockwise variant="primary" @mouseenter="animation='spin-pulse'" @mouseleave="animation=''" :animation="animation" font-scale="2" id="refresh-action" @click="resetFilters()"/>
             <b-tooltip target="refresh-action">
                 Refresh filters
@@ -37,52 +37,36 @@ import FilterComponent from '../base/FilterComponent.vue'
 import portalService from '../../services/DataPortalService'
 import {PROJECT_ACCESSION} from '../../utils/static-config'
 import MultiSelectComponent from '../base/MultiSelectComponent.vue'
-
+import {dataOptions} from '../../utils/static-config'
 export default {
     data(){
         return {
             options: [{name:'Species name',item:'species_name'},{name:'TaxID',item:'taxid'}, {name:'Common name',item:'common_name'},{name:'ToLID', item:'tolid'}],
-            checkboxOptions:[
-                {text: 'Acquired samples', value: 'local_samples'},
-                {text: 'Submitted samples', value: 'insdc_samples'},
-                {text: 'Submitted reads', value: 'experiments'},
-                {text: 'Submitted assemblies', value: 'assemblies'},
-                {text: 'Annotations', value: 'annotations'}
-            ],
-            selectedCheckboxes:[],
+            checkboxOptions:dataOptions,
             animation:'',
             projectAccession: PROJECT_ACCESSION
         }
     },
     computed: {
         ...mapFields({
-            fields: ['onlySelectedData','selectedBioproject'],
+            fields: ['selectedData','onlySelectedData','selectedBioproject'],
             module: 'portal',
             mutation: 'portal/setField'      
-        })
+        }),
     },
     watch:{
-        selectedCheckboxes(values){
-            this.checkboxOptions
-            .map(it => {return it.value})
-            .forEach(it => {
-                if (values.filter(v => v === it).length){
-                    this.$store.commit('portal/setField', {label: it, value:true})
-                }else{
-                    this.$store.commit('portal/setField', {label: it, value:false})
-                }
-            })
-            this.$root.$emit('bv::refresh::table', 'organisms-table')
-        },
         selectedBioproject(){
             this.$root.$emit('bv::refresh::table', 'organisms-table')
         },
         onlySelectedData(){
             this.$root.$emit('bv::refresh::table', 'organisms-table')
+        },
+        selectedData(){
+            this.$root.$emit('bv::refresh::table', 'organisms-table')
         }
     },
     components:{
-    BFormCheckbox,BFormCheckboxGroup,BTooltip,
+        BFormCheckbox,BFormCheckboxGroup,BTooltip,
         BIconArrowClockwise,FilterComponent,MultiSelectComponent
     },
     created(){
@@ -101,7 +85,6 @@ export default {
     },
     methods:{
         resetFilters(){
-            this.selectedCheckboxes=[]
             this.$store.dispatch('portal/resetFilters')
         }
     }
diff --git a/client/src/components/organism/OrganismsComponent.vue b/client/src/components/organism/OrganismsComponent.vue
index 083b735a..3cad6101 100644
--- a/client/src/components/organism/OrganismsComponent.vue
+++ b/client/src/components/organism/OrganismsComponent.vue
@@ -89,6 +89,7 @@ import SubmissionService from '../../services/SubmissionService';
 import DataModal from '../modal/DataModal.vue';
 import EditOrganismModal from '../modal/EditOrganismModal.vue';
 import PaginationComponent from '../base/PaginationComponent.vue';
+import {dataOptions} from '../../utils/static-config'
 
 export default {
   components: 
@@ -103,9 +104,7 @@ export default {
       fields: ['filter','perPage',
        'onlySelectedData','selectedBioproject',
        'option','taxName',
-       'totalRows','currentPage',
-       'insdc_samples','local_samples',
-       'experiments','assemblies','annotations'],
+       'totalRows','currentPage','selectedData'],
       module: 'portal',
       mutation: 'portal/setField'      
     }),
@@ -144,43 +143,18 @@ export default {
       organism:null,
       commonNames: '',
       model:'',
+      dataOptions: dataOptions
     }
   },
   watch: {
-      insdc_samples(value){
-      if (value){
-        this.fields.filter(f => f.key === 'insdc_samples').forEach(f => f.variant = "success")
-      }else{
-        this.fields.filter(f => f.key === 'insdc_samples').forEach(f => f.variant = "")
-      }
-    },
-    local_samples(value){
-      if (value){
-        this.fields.filter(f => f.key === 'local_samples').forEach(f => f.variant = "info")
-      }else{
-        this.fields.filter(f => f.key === 'local_samples').forEach(f => f.variant = "")
-      }
-    },
-    assemblies(value){
-      if (value){
-        this.fields.filter(f => f.key === 'assemblies').forEach(f => f.variant = "primary")
-      }else{
-        this.fields.filter(f => f.key === 'assemblies').forEach(f => f.variant = "")
-      }
-    },
-    experiments(value){
-      if (value){
-        this.fields.filter(f => f.key === 'experiments').forEach(f => f.variant = "warning")
-      }else{
-        this.fields.filter(f => f.key === 'experiments').forEach(f => f.variant = "")
-      }
-    },
-    annotations(value){
-      if (value){
-        this.fields.filter(f => f.key === 'annotations').forEach(f => f.variant = "secondary")
-      }else{
-        this.fields.filter(f => f.key === 'annotations').forEach(f => f.variant = "")
-      }
+     selectedData(values){
+        this.dataOptions.forEach(opt => {
+          if (values.includes(opt.value)){
+            this.fields.filter(f => f.key === opt.value).forEach(f => f.variant = opt.variant)
+          }else{
+              this.fields.filter(f => f.key === opt.value).forEach(f => f.variant = "")
+          }
+        })
     },
     option(){
       this.filter=''
@@ -241,6 +215,15 @@ export default {
     },
     organismsProvider(ctx,callback){
       const fromParam = (ctx.currentPage - 1) * ctx.perPage
+      const selectedData = this.dataOptions.map(opt => {
+        var data = {}
+        if (this.selectedData.includes(opt.value)){
+          data[opt.value] = true
+        }else{
+          data[opt.value] = false
+        }
+        return data
+      })
       const params = {
         filter: ctx.filter,
         offset: fromParam,
@@ -248,14 +231,10 @@ export default {
         sortColumn: ctx.sortBy,
         sortOrder: ctx.sortDesc,
         taxName: this.taxName,
-        insdc_samples: this.insdc_samples,
-        local_samples: this.local_samples,
-        assemblies: this.assemblies,
-        experiments: this.experiments,
-        annotations: this.annotations,
         option: this.option,
         onlySelectedData: this.onlySelectedData,
-        bioproject:this.selectedBioproject
+        bioproject:this.selectedBioproject,
+        ...Object.assign({}, ...selectedData)
         }
       this.defaultSearch(params,callback)
     }
diff --git a/client/src/store/modules/portal.js b/client/src/store/modules/portal.js
index 2516ecf9..2600d885 100644
--- a/client/src/store/modules/portal.js
+++ b/client/src/store/modules/portal.js
@@ -15,11 +15,7 @@ const getDefaultState = () => ({
     position: '',
     breadcrumbs: [{text: 'Home', to: {name: 'home-page'}}], // home as default
     maxLeaves:90,
-    insdc_samples:false,
-    local_samples:false,
-    experiments:false,
-    assemblies:false,
-    annotations:false,
+    selectedData:[],
     selectedBioproject:PROJECT_ACCESSION,
     onlySelectedData:false,
 })
@@ -98,7 +94,6 @@ const mutations = {
         .catch(()=>{
             state.loading=false
         })
-        // state = {...getDefaultState()}
     }
 }
 const getters= {
diff --git a/client/src/utils/static-config.js b/client/src/utils/static-config.js
index 0db5d770..2dfd02e8 100644
--- a/client/src/utils/static-config.js
+++ b/client/src/utils/static-config.js
@@ -1,6 +1,13 @@
 module.exports = {
     ROOTNODE: process.env.VUE_APP_ROOT_NODE,
     PROJECT_ACCESSION: process.env.VUE_APP_PROJECT_ACCESSION,
+    dataOptions:[
+        {text: 'Acquired samples', value: 'local_samples', variant:"info"},
+        {text: 'Submitted samples', value: 'insdc_samples',variant:"success"},
+        {text: 'Submitted reads', value: 'experiments',variant:"warning"},
+        {text: 'Submitted assemblies', value: 'assemblies',variant:"primary"},
+        {text: 'Annotations', value: 'annotations',variant:"secondary"}
+    ],
     checklistFieldGroups : [
         {'fields': [
             {'label': 'organism part','model':'organism_part', 'description': "The part of organism's anatomy or substance arising from an organism from which the biomaterial was derived, excludes cells.", 'type': 'text_choice_field', 'mandatory': 'mandatory', 'multiplicity': 'single', 'options': ['WHOLE_ORGANISM', 'HEAD', 'THORAX', 'ABDOMEN', 'CEPHALOTHORAX', 'BRAIN', 'EYE', 'FAT_BODY', 'INTESTINE', 'BODYWALL', 'TERMINAL_BODY', 'ANTERIOR_BODY', 'MID_BODY', 'POSTERIOR_BODY', 'HEPATOPANCREAS', 'LEG', 'BLOOD', 'LUNG', 'HEART', 'KIDNEY', 'LIVER', 'ENDOCRINE_TISSUE', 'SPLEEN', 'STOMACH', 'PANCREAS', 'MUSCLE', 'MODULAR_COLONY', 'TENTACLE', 'FIN', 'SKIN', 'SCAT', 'EGGSHELL', 'SCALES', 'MOLLUSC_FOOT', 'HAIR', 'GILL_ANIMAL', '**OTHER_SOMATIC_ANIMAL_TISSUE**', 'OVIDUCT', 'GONAD', 'OVARY_ANIMAL', 'TESTIS', 'SPERM_SEMINAL_FLUID', 'EGG', '**OTHER_REPRODUCTIVE_ANIMAL_TISSUE**', 'WHOLE_PLANT', 'SEEDLING', 'SEED', 'LEAF', 'FLOWER', 'BLADE', 'STEM', 'PETIOLE', 'SHOOT', 'BUD', 'THALLUS_PLANT', 'BRACT', '**OTHER_PLANT_TISSUE**', 'MYCELIUM', 'MYCORRHIZA', 'SPORE_BEARING_STRUCTURE', 'HOLDFAST_FUNGI', 'STIPE', 'CAP', 'GILL_FUNGI', 'THALLUS_FUNGI', 'SPORE', '**OTHER_FUNGAL_TISSUE**', 'NOT_COLLECTED', 'NOT_APPLICABLE', 'NOT_PROVIDED', 'UNICELLULAR_ORGANISMS_IN_CULTURE', 'MULTICELLULAR_ORGANISMS_IN_CULTURE']}, 
diff --git a/client/src/views/HomePage.vue b/client/src/views/HomePage.vue
index f18e4660..c62efb50 100644
--- a/client/src/views/HomePage.vue
+++ b/client/src/views/HomePage.vue
@@ -1,10 +1,5 @@
 <template>
     <b-container fluid class="router-container">
-        <b-row>
-            <b-col lg="6">
-                <!-- <last-published-banner/> -->
-            </b-col>
-        </b-row>
         <b-row>
             <b-col lg="3" md="4" style="overflow: auto;max-height:120px">
                 <tree-bread-crumb-component/>
@@ -39,7 +34,6 @@ export default {
         OrganismsComponent,
         TreeBreadCrumbComponent,
         OrganismFilterComponent,
-        // LastPublishedBanner,
     }
 }
 </script>
diff --git a/db-dump/dump_2022-05-18.gz b/db-dump/dump_2022-05-18.gz
new file mode 100644
index 00000000..01e20b27
Binary files /dev/null and b/db-dump/dump_2022-05-18.gz differ
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
new file mode 100644
index 00000000..50aaa6d1
--- /dev/null
+++ b/docker-compose-dev.yml
@@ -0,0 +1,49 @@
+version: '3'
+
+services:
+
+  biogenome_mongo:
+    image: mongo:latest
+    container_name: "${DB_DEV_HOST}"
+    env_file:
+      - .env
+    volumes:
+     - ./mongo-init.sh:/docker-entrypoint-initdb.d/mongo-init.sh
+     - ./mongo-restore.sh:/docker-entrypoint-initdb.d/mongo-restore.sh
+     - ./db-dump:/db-dump
+     - mongodb-data:${MONGODB_DATA_DIR}
+    ports:
+      - "27015:${DB_PORT}"
+  
+  biogenome_server:
+    build: ./server
+    container_name: "biogenome_server"
+    restart: always
+    volumes:
+      - ./server:/server
+    env_file: 
+      - .env
+      
+  biogenome_nginx:
+    build: 
+      context: ./client
+      dockerfile: Dockerfile
+      args:
+        - ROOT_NODE=$ROOT_NODE
+        - PROJECT_ACCESSION=$PROJECT_ACCESSION
+    container_name: "biogenome_nginx"
+    restart: always
+    volumes:
+      - ./client:/client
+      - node_modules:/client/node_modules
+    environment:
+      - API_PORT=${API_PORT}
+      - API_HOST=${API_HOST}
+    ports:
+        - "91:${API_PORT}"   
+
+
+volumes:
+  app:
+  mongodb-data:
+  node_modules:
diff --git a/docker-compose.yml b/docker-compose.yml
index 8b515a4b..49ffd633 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -37,22 +37,6 @@ networks:
     external:
       name: biogenome-network     
       
-  # biogenome_mongo:
-  #   image: mongo:latest
-  #   container_name: "biogenome_mongo"
-  #   command: mongod --port 27015 #change default port 
-  #   environment:
-  #     MONGO_INITDB_ROOT_USERNAME: root
-  #     MONGO_INITDB_ROOT_PASSWORD: root
-  #     MONGO_INITDB_DATABASE: biogenome_db
-  #     MONGODB_DATA_DIR: /var/lib/mongodb-data
-  #     MONDODB_LOG_DIR: /dev/null
-  #   volumes:
-  #    - mongodb-data:/var/lib/mongodb-data
-  #   ports:
-  #     - "27015:27015"
-
 volumes:
   app:
-  mongodb-data:
   node_modules:
diff --git a/mongo-init.sh b/mongo-init.sh
new file mode 100644
index 00000000..c01aa0c3
--- /dev/null
+++ b/mongo-init.sh
@@ -0,0 +1,20 @@
+set -e
+
+printenv
+mongo <<EOF
+
+use admin
+
+db.auth('$MONGO_INITDB_ROOT_USERNAME','$MONGO_INITDB_ROOT_PASSWORD')
+
+db.getSiblingDB('$DB_NAME')
+
+db.createUser({
+  user: '$DB_USER',
+  pwd:  '$DB_PASS',
+  roles: [{
+    role: 'readWrite',
+    db: '$DB_NAME'
+  }]
+})
+EOF
\ No newline at end of file
diff --git a/mongo-restore.sh b/mongo-restore.sh
new file mode 100644
index 00000000..31d3921c
--- /dev/null
+++ b/mongo-restore.sh
@@ -0,0 +1,4 @@
+#! /bin/bash
+set -e
+
+mongorestore --gzip --archive=./db-dump/${DB_DUMP} --db=${DB_NAME}
\ No newline at end of file
diff --git a/server/config.py b/server/config.py
index af2dfb34..8d18507c 100644
--- a/server/config.py
+++ b/server/config.py
@@ -3,7 +3,7 @@
 class BaseConfig(object):
     DEBUG = True
     MONGODB_DB = os.environ['DB_NAME']
-    MONGODB_HOST = os.environ['DB_HOST']
+    MONGODB_HOST = os.environ.get('DB_PROD_HOST', os.environ['DB_DEV_HOST'])
     MONGODB_PORT = int(os.environ['DB_PORT'])
     MONGODB_USERNAME = os.environ['DB_USER']
     MONGODB_PASSWORD = os.environ['DB_PASS']