diff --git a/additional_install.sh b/additional_install.sh
index be554e0..6b3ae88 100755
--- a/additional_install.sh
+++ b/additional_install.sh
@@ -62,12 +62,19 @@ if [[ "$BITWARDEN" == "yes" ]]; then
 	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;
+	cp -rv /tmp/bitwarden/firewall-bitwarden-dns.json $SERVICE_DIR/firewall-bitwarden-dns.json;
+	cp -rv /tmp/bitwarden/firewall-bitwarden-mtp.json $SERVICE_DIR/firewall-bitwarden-smtp.json;
 fi;
 
 if [[ "$NEXTCLOUD" == "yes" ] || [ "$BITWARDEN" == "yes" ]]; then 
+	echo "SMTP service install has started from ssh://$GIT_REPO/$ORGANIZATION/smtp.git";
 
+	git clone ssh://$GIT_REPO/$ORGANIZATION/smtp.git /tmp/smtp
+
+	cp -rv /tmp/smtp/smtp-secret.json /etc/user/secret/smtp.json;
+	cp -rv /tmp/smtp/smtp.json $SERVICE_DIR/smtp.json;
+	cp -rv /tmp/smtp/firewall-smtp.json $SERVICE_DIR/firewall-smtp.json;
+	
 
 fi;