diff --git a/Singularity b/Singularity
index fae58546c5a570a3590a3708138d5d95401e9a06..da19ece82b4230f65893103a7cfd4d2529e41a26 100644
--- a/Singularity
+++ b/Singularity
@@ -3,7 +3,7 @@ From: mongo:4.0.6
 
 %startscript
 
-/usr/bin/mongod --config /etc/mongo/mongod.conf
+/usr/bin/mongod --config /etc/mongo/mongod.conf --port $MONGOPORT
 
 %post
 
diff --git a/mongo.sh b/mongo.sh
index 57607076e7c927bb790fe3cee494471323687b17..d6480ebf466a17feb20a6a83bdccd4bdadd9d5aa 100644
--- a/mongo.sh
+++ b/mongo.sh
@@ -5,14 +5,16 @@
 #SBATCH --gres=tmp:1G
 
 # Make sure the directories exists
-MONGOPATH=/scratch/sing-training/moscardo/singularity-service-example
+MONGOPATH=/scratch/sing-training/scholtal/singularity-service-example
+
+MONGOPORT=26011
 
 echo "Copying DDBB"
 time cp -ra $MONGOPATH/data $TMPDIR
 
 # --verbose flag can be added to Singularity for debugging purposes.
 echo "Running database"
-time singularity instance start -B $MONGOPATH/log:/var/log/mongodb -B $MONGOPATH:$MONGOPATH -B $TMPDIR/data:/var/lib/mongo -B $MONGOPATH/mongoconf:/etc/mongo/ $MONGOPATH/mongo_4.0.6.img  mongo
+SINGULARITYENV_MONGOPORT=$MONGOPORT time singularity instance start -B $MONGOPATH/log:/var/log/mongodb -B $MONGOPATH:$MONGOPATH -B $TMPDIR/data:/var/lib/mongo -B $MONGOPATH/mongoconf:/etc/mongo/ $MONGOPATH/mongo_4.0.6.img  mongo
 
 # Giving some time to start up the DDBB, useful when not shutted down properly 
 sleep 30
@@ -22,11 +24,11 @@ sleep 30
 # 
 
 # Insert results data into the DDBB
-time singularity  exec instance://mongo mongo 127.0.0.1:26016/testddbb --eval 'var document = [{name  : "John",position : "Teacher",}, {name  : "Marie",position : "Doctor",}];db.MyCollection.insert(document);'
+time singularity  exec instance://mongo mongo 127.0.0.1:$MONGOPORT/testddbb --eval 'var document = [{name  : "John",position : "Teacher",}, {name  : "Marie",position : "Doctor",}];db.MyCollection.insert(document);'
 
 # Getting results from a query
 echo "Query ...."
-time singularity  exec instance://mongo  mongoexport -d testddbb --port 26016 -c MyCollection --query '{"position":{"$eq": "Teacher" }}' --out $TMPDIR/test.out --type csv --fields name,position
+time singularity  exec instance://mongo  mongoexport -d testddbb --port $MONGOPORT -c MyCollection --query '{"position":{"$eq": "Teacher" }}' --out $TMPDIR/test.out --type csv --fields name,position
 
 sleep 5
 echo "Copying in memmory results to FS"
diff --git a/mongoconf/mongod.conf b/mongoconf/mongod.conf
index 946c79775b9a6c3ff52f6201e417d423fd8296f0..49a74af92e2bb3ddc45914b04409c4937718c43d 100644
--- a/mongoconf/mongod.conf
+++ b/mongoconf/mongod.conf
@@ -22,7 +22,7 @@ systemLog:
 
 # network interfaces
 net:
-  port: 26016
+  port: 26011
   bindIp: 0.0.0.0