diff --git a/Dockerfile b/Dockerfile
index 157b2a08..1616ca93 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,6 @@ FROM debian:sid
 LABEL version="1.1"
 LABEL description="Dockerized version of Trustedsec PTF - Penetration Testing Framework"
 LABEL author="Jacobo Avariento Gimeno"
-
+COPY .bashrc /root/.bashrc
 COPY bootstrap.sh /root/bootstrap.sh
 RUN bash -c /root/bootstrap.sh
diff --git a/bootstrap.sh b/bootstrap.sh
index 0e725a15..bbe2b31f 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -2,16 +2,18 @@
 #
 # Commands run by Docker when building the docker container with PTF framework
 #
+# Author: Jacobo Avariento Gimeno
 #
+
 echo "docker-ptf" > /etc/hostname
 apt-get update
 apt-get upgrade -y
 apt-get install -y python git sudo locate vim #libgmp3-dev:i386
 cd /root
-git clone https://github.com/spinfoo/ptf.git
+git clone https://github.com/trustedsec/ptf.git
 cd ptf
-git checkout docker
-git pull origin docker
+#git checkout docker
+#git pull origin docker
 echo -en "use modules/install_update_all\nyes\n" | python ptf
 echo
 echo
diff --git a/modules/reporting/keepnote.py b/modules/reporting/keepnote.py
index c82e53b4..7a1c1d0c 100644
--- a/modules/reporting/keepnote.py
+++ b/modules/reporting/keepnote.py
@@ -20,7 +20,7 @@
 INSTALL_LOCATION="keepnote"
 
 # DEPENDS FOR DEBIAN INSTALLS
-DEBIAN="python-gnome2-dev,aspell,aspell-en,python,python-gtk2,python-glade2,libgtk2.0-dev,libsqlite3-0"
+DEBIAN="aspell aspell-en python python-gtk2 python-glade2 libgtk2.0-dev libsqlite3-0"
 
 # DEPENDS FOR FEDORA INSTALLS
 FEDORA="git,gnome-python2-devel,aspell,aspell-en,python,pygtk2,gtk2-devel,libsqlite3x"
diff --git a/modules/vulnerability-analysis/owtf.py b/modules/vulnerability-analysis/owtf.py
index cb59f985..0912dd6f 100644
--- a/modules/vulnerability-analysis/owtf.py
+++ b/modules/vulnerability-analysis/owtf.py
@@ -14,18 +14,18 @@
 INSTALL_TYPE="GIT"
 
 # LOCATION OF THE FILE OR GIT/SVN REPOSITORY
-REPOSITORY_LOCATION="https://github.com/owtf/owtf-docker.git"
+REPOSITORY_LOCATION="https://github.com/owtf/owtf.git"
 
 # WHERE DO YOU WANT TO INSTALL IT
 INSTALL_LOCATION="owtf"
 
 # DEPENDS FOR DEBIAN INSTALLS
-DEBIAN="git"
+DEBIAN="git postgresql-11"
 
 # DEPENDS FOR FEDORA INSTALLS
-# FEDORA="subversion,autoconf,make,automake,gcc,gcc-c++,kernel-devel,openssl-devel"
+FEDORA="git"
 
 # COMMANDS TO RUN AFTER
-AFTER_COMMANDS=""
+AFTER_COMMANDS="cd {INSTALL_LOCATION}, python setup.py install, systemctl enable postgresql, /etc/init.d/postgresql start, export OWTF_USER=$(grep DATABASE_USER owtf/settings.py | tail -1 | cut -d'"' -f2), export OWTF_PASS=$(grep DATABASE_PASS owtf/settings.py | tail -1 | cut -d'"' -f2), export OWTF_DB=$(grep DATABASE_NAME owtf/settings.py | tail -1 | cut -d'"' -f2), psql -c \"CREATE USER $OWTF_USER WITH PASSWORD $OWTF_PASS\", psql -c \"CREATE DATABASE $OWTF_DB WITH OWNER $OWTF_USER ENCODING 'utf-8' TEMPLATE template0;\""
 
 LAUNCHER="owtf"