diff --git a/mailpiler.orig b/mailpiler.orig
index d03a8dc..3acd4eb 100644
--- a/mailpiler.orig
+++ b/mailpiler.orig
@@ -1,9 +1,6 @@
 #!/bin/bash
 
-#Variables will be filled in from the mainscript:
-
-#PILER_VAR
-
+source ./zamba.conf
 
 HOSTNAME=$(hostname -f)
 
@@ -26,7 +23,7 @@ echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" | tee /etc/apt
 
 apt update && apt full-upgrade -y
 
-apt install -y mc sysstat build-essential libwrap0-dev libpst-dev tnef libytnef0-dev unrtf catdoc libtre-dev tre-agrep poppler-utils libzip-dev unixodbc libpq5 software-properties-common libpoppler-dev openssl libssl-dev memcached telnet nginx mariadb-server default-libmysqlclient-dev python-mysqldb gcc libwrap0 libzip4 latex2rtf latex2html catdoc tnef libpq5 zipcmp zipmerge ziptool libsodium23
+apt install -y $LXC_TOOLSET build-essential libwrap0-dev libpst-dev tnef libytnef0-dev unrtf catdoc libtre-dev tre-agrep poppler-utils libzip-dev unixodbc libpq5 software-properties-common libpoppler-dev openssl libssl-dev memcached telnet nginx mariadb-server default-libmysqlclient-dev python-mysqldb gcc libwrap0 libzip4 latex2rtf latex2html catdoc tnef zipcmp zipmerge ziptool libsodium23
 
 apt update && apt install -y php$PILER_PHP_VERSION-{fpm,common,ldap,mysql,cli,opcache,phpdbg,gd,memcache,json,readline,zip}
 
diff --git a/matrix.orig b/matrix.orig
index 54219cc..e21d555 100644
--- a/matrix.orig
+++ b/matrix.orig
@@ -1,7 +1,6 @@
 #!/bin/bash
 
-#MATRIX_VAR
-
+source ./zamba.conf
 
 MRX_PKE=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
 
@@ -11,7 +10,7 @@ ELE_DBPASS=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
 
 apt update && apt full-upgrade -y
 
-apt install -y lsb-release apt-transport-https curl gpg software-properties-common net-tools nginx mc postgresql python3-psycopg2
+apt install -y $LXC_TOOLSET apt-transport-https gpg software-properties-common nginx postgresql python3-psycopg2
 
 wget wget -O /usr/share/keyrings/matrix-org-archive-keyring.gpg https://packages.matrix.org/debian/matrix-org-archive-keyring.gpg
 echo "deb [signed-by=/usr/share/keyrings/matrix-org-archive-keyring.gpg] https://packages.matrix.org/debian/ $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/matrix-org.list
diff --git a/zamba.conf b/zamba.conf
index 8c4e327..3189d6d 100644
--- a/zamba.conf
+++ b/zamba.conf
@@ -61,7 +61,7 @@ LXC_PWD="MYPASSWD"
 LXC_AUTHORIZED_KEY="ssh-rsa xxxxxxxx"
 
 # Define your favorite tools, you always want to have installed on your linux systems
-LXC_TOOLSET="net-tools dnsutils mc"
+LXC_TOOLSET="net-tools dnsutils mc sysstat lsb-release curl git"
 
 ############### Zamba-Server-Section ###############
 
diff --git a/zmb_mem.orig b/zmb_mem.orig
index f8355e1..78455fd 100644
--- a/zmb_mem.orig
+++ b/zmb_mem.orig
@@ -1,11 +1,9 @@
 #!/bin/bash
 
-#ZMB_VAR
-
-
+source ./zamba.conf
 
 apt update && apt full-upgrade -y
-echo -ne '\n' | apt install -y acl dnsutils mc samba winbind libpam-winbind libnss-winbind krb5-user krb5-config samba-dsdb-modules samba-vfs-modules 
+echo -ne '\n' | apt install -y $LXC_TOOLSET acl samba winbind libpam-winbind libnss-winbind krb5-user krb5-config samba-dsdb-modules samba-vfs-modules 
 
 mv /etc/krb5.conf /etc/krb5.conf.bak
 cat > /etc/krb5.conf <<EOF