diff --git a/lib/bookstack.sh b/lib/bookstack.sh
index 6d7278b..2b200d1 100644
--- a/lib/bookstack.sh
+++ b/lib/bookstack.sh
@@ -40,6 +40,7 @@ networks:
     external: true
 EOF
 
+EXTERNALIP=$(get_externalip);
 ADMINPASS=`cat /federated/apps/panel/.env | grep SMTP_PASSWORD | awk -F= '{ print $2 }'`
 BOOKSTACK_ADMINPASSWORD=`htpasswd -bnBC 10 "" $ADMINPASS | tr -d ':\n' | sed 's/$2y/$2b/'`
 BOOKSTACK_SECRET=$(create_password);
@@ -83,6 +84,8 @@ start_bookstack() {
 
   docker exec pdns pdnsutil add-record $DOMAIN bookstack A 86400 $EXTERNALIP
   [ $? -ne 0 ] && fail "Couldn't add dns record for bookstack"
+  docker exec pdns pdnsutil add-record $DOMAIN documentation A 86400 $EXTERNALIP
+  [ $? -ne 0 ] && fail "Couldn't add dns record for bookstack"
 
   PDNS_MYSQL_COMMAND="update users set password=\"$BOOKSTACK_ADMINPASSWORD\" where id = \"1\";"
   docker exec pdnsmysql bash -c "mysql -ubookstack -p$BOOKSTACK_SECRET bookstack -e '$PDNS_MYSQL_COMMAND;'"
diff --git a/lib/espocrm.sh b/lib/espocrm.sh
index de360fc..7d7e279 100644
--- a/lib/espocrm.sh
+++ b/lib/espocrm.sh
@@ -41,7 +41,8 @@ networks:
     external: true
 EOF
 
-ADMINPASS=`cat /federated/apps/castopod/.env | grep CP_EMAIL_SMTP_PASSWORD | awk -F= '{ print $2 }'`
+ADMINPASS=`cat /federated/apps/panel/.env | grep SMTP_PASSWORD | awk -F= '{ print $2 }'`
+EXTERNALIP=$(get_externalip);
 ESPOCRM_SECRET=$(create_password);
 MYSQL_ROOTPASSWORD=`cat /federated/apps/pdnsmysql/.env | grep MYSQL_ROOT_PASSWORD | awk -F= '{ print $2 }'`
 LDAP_SECRET=`cat /federated/apps/ldap/.ldap.secret`
diff --git a/lib/freescout.sh b/lib/freescout.sh
index c1c808e..2cd75b2 100644
--- a/lib/freescout.sh
+++ b/lib/freescout.sh
@@ -43,6 +43,7 @@ networks:
 EOF
 
 ADMINPASS=`cat /federated/apps/panel/.env | grep SMTP_PASSWORD | awk -F= '{ print $2 }'`
+EXTERNALIP=$(get_externalip);
 FREESCOUT_SECRET=$(create_password);
 
 cat > /federated/apps/freescout/.env <<EOF
diff --git a/lib/functions.sh b/lib/functions.sh
index 21f2d8f..6647d2e 100644
--- a/lib/functions.sh
+++ b/lib/functions.sh
@@ -118,6 +118,10 @@ create_password() {
   SECRET=`tr -cd '[:alnum:]' < /dev/urandom | fold -w32 | head -n1`
   echo "$SECRET";
 }
+get_externalip() {
+  EXTERNALIP=`dig @resolver4.opendns.com myip.opendns.com +short 2> /dev/null`
+  echo "$EXTERNALIP";
+}
 start_service_convert() {
   SERVICE="$1"
   COMMAND="$2"