diff --git a/additional_install.sh b/additional_install.sh
index 837d243..be554e0 100755
--- a/additional_install.sh
+++ b/additional_install.sh
@@ -46,9 +46,29 @@ if [[ "$BITWARDEN" == "yes" ]]; then
 	git clone ssh://$GIT_REPO/$ORGANIZATION/bitwarden.git /tmp/bitwarden
 
 	BITWARDEN_TOKEN=$(openssl rand -base64 48);
-
+	DB_MYSQL="$(echo $RANDOM | md5sum | head -c 8)";
+        DB_USER="$(echo $RANDOM | md5sum | head -c 8)";
+        DB_PASSWORD="$(echo $RANDOM | md5sum | head -c 10)";
+        DB_ROOT_PASSWORD="$(echo $RANDOM | md5sum | head -c 10)";
+	
+	sed -i "s/DB_MYSQL/$DB_MYSQL/g" /tmp/bitwarden/bitwarden-secret.json;
+	sed -i "s/DB_USER/$DB_USER/g" /tmp/bitwarden/bitwarden-secret.json;
+	sed -i "s/DB_PASSWORD/$DB_PASSWORD/g" /tmp/bitwarden/bitwarden-secret.json;
+	sed -i "s/DB_ROOT_PASSWORD/$DB_ROOT_PASSWORD/g" /tmp/bitwarden/bitwarden-secret.json;
 	sed -i "s/DOMAIN_NAME/$BITWARDEN_DOMAIN/g" /tmp/bitwarden/bitwarden-secret.json
 	sed -i "s/ADMIN_TOKEN/$BITWARDEN_TOKEN/g" /tmp/bitwarden/bitwarden-secret.json
+
 	cp -rv /tmp/bitwarden/bitwarden-secret.json /etc/user/secret/bitwarden.json;
+	cp -rv /tmp/bitwarden/bitwarden.json $SERVICE_DIR/bitwarden.json;
+	cp -rv /tmp/bitwarden/domain-bitwarden.json $SERVICE_DIR/domain-bitwarden.json;
+	cp -rv /tmp/bitwarden/firewall-bitwarden.json $SERVICE_DIR/firewall-bitwarden.json;
+	cp -rv /tmp/bitwarden/firewall-bitwarden-server-dns.json $SERVICE_DIR/firewall-bitwarden-server-dns.json;
+	cp -rv /tmp/bitwarden/firewall-bitwarden-server-smtp.json $SERVICE_DIR/firewall-bitwarden-server-smtp.json;
 fi;
 
+if [[ "$NEXTCLOUD" == "yes" ] || [ "$BITWARDEN" == "yes" ]]; then 
+
+
+fi;
+
+