diff --git a/installer/bin/clean.sh b/installer/bin/clean.sh
index ae60d124..8cc61381 100755
--- a/installer/bin/clean.sh
+++ b/installer/bin/clean.sh
@@ -48,7 +48,7 @@ fuELK () {
   # ELK data will be kept for <= 90 days, check /etc/crontab for curator modification
   # ELK daemon log files will be removed
   rm -rf /data/elk/log/*
-  mkdir -p /data/elk/logstash/conf 
+  mkdir -p /data/elk 
   chmod 760 /data/elk -R
   chown tpot:tpot /data/elk -R
 }
@@ -78,6 +78,14 @@ fuHONEYTRAP () {
   chown tpot:tpot /data/honeytrap/ -R
 }
 
+# Let's create a function prepare spiderfoot db
+fuSPIDERFOOT () {
+  mkdir -p /data/spiderfoot
+  touch /data/spiderfoot/spiderfoot.db
+  chmod 760 -R /data/spiderfoot
+  chown tpot:tpot -R /data/spiderfoot
+}
+
 # Let's create a function to clean up and prepare suricata data
 fuSURICATA () {
   rm -rf /data/suricata/*
@@ -94,4 +102,5 @@ fuELK
 fuEMOBILITY
 fuGLASTOPF
 fuHONEYTRAP
+fuSPIDERFOOT
 fuSURICATA
diff --git a/installer/etc/tpot/compose/all.yml b/installer/etc/tpot/compose/all.yml
index 95ac5b45..aaf92ada 100644
--- a/installer/etc/tpot/compose/all.yml
+++ b/installer/etc/tpot/compose/all.yml
@@ -226,6 +226,8 @@ services:
     ports:
      - "127.0.0.1:64303:8080"
     image: "dtagdevsec/spiderfoot:1706"
+    volumes:
+     - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/spiderfoot.db
 
 # Ui-for-docker service
   ui-for-docker:
diff --git a/installer/etc/tpot/compose/industrial.yml b/installer/etc/tpot/compose/industrial.yml
index ce9a54bd..ec6bb573 100644
--- a/installer/etc/tpot/compose/industrial.yml
+++ b/installer/etc/tpot/compose/industrial.yml
@@ -140,6 +140,8 @@ services:
     ports:
      - "127.0.0.1:64303:8080"
     image: "dtagdevsec/spiderfoot:1706"
+    volumes:
+     - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/spiderfoot.db
 
 # Ui-for-docker service
   ui-for-docker:
diff --git a/installer/etc/tpot/compose/tpot.yml b/installer/etc/tpot/compose/tpot.yml
index 5f722bc3..a748ca92 100644
--- a/installer/etc/tpot/compose/tpot.yml
+++ b/installer/etc/tpot/compose/tpot.yml
@@ -195,6 +195,8 @@ services:
     ports:
      - "127.0.0.1:64303:8080"
     image: "dtagdevsec/spiderfoot:1706"
+    volumes:
+     - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/spiderfoot.db
 
 # Ui-for-docker service
   ui-for-docker:
diff --git a/installer/install.sh b/installer/install.sh
index 02bde0fa..1b3a03dc 100755
--- a/installer/install.sh
+++ b/installer/install.sh
@@ -443,9 +443,11 @@ mkdir -p /data/conpot/log \
          /data/glastopf /data/honeytrap/log/ /data/honeytrap/attacks/ /data/honeytrap/downloads/ \
          /data/emobility/log \
          /data/ews/conf \
+         /data/spiderfoot \
          /data/suricata/log /home/tsec/.ssh/ \
          /etc/tpot/elk /etc/tpot/compose /etc/tpot/systemd \
          /usr/share/tpot/bin 2>&1 | dialog --title "[ Creating some files and folders ]" $myPROGRESSBOXCONF
+touch /data/spiderfoot/spiderfoot.db 2>&1 | dialog --title "[ Creating some files and folders ]" $myPROGRESSBOXCONF
 
 # Let's take care of some files and permissions before copying
 chmod 500 /root/tpot/bin/* 2>&1 | dialog --title "[ Setting permissions ]" $myPROGRESSBOXCONF