diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml
index 816f63d..92568f3 100644
--- a/group_vars/all/main.yml
+++ b/group_vars/all/main.yml
@@ -2292,7 +2292,6 @@ luks_device: []
 
 apt_ansible_dependencies:
   - python
-  - python-apt
   - python3
   - python3-apt
   - lsb-release
@@ -2303,6 +2302,8 @@ apt_ansible_dependencies:
   - net-tools
   - vlan
 
+  #- python-apt
+
 
 # ---
 # vars used by roles/ansible_user
diff --git a/roles/common/templates/etc/apt/sources.list.Debian.j2 b/roles/common/templates/etc/apt/sources.list.Debian.j2
index 8e79f45..5284dbb 100644
--- a/roles/common/templates/etc/apt/sources.list.Debian.j2
+++ b/roles/common/templates/etc/apt/sources.list.Debian.j2
@@ -3,8 +3,24 @@
 deb {{ apt_debian_mirror }} {{ ansible_lsb.codename }} main
 {{ '# ' if not apt_src_enable else '' }}deb-src {{ apt_debian_mirror }} {{ ansible_lsb.codename }} main
 
-deb http://security.debian.org/ {{ ansible_lsb.codename }}/updates main
-{{ '# ' if not apt_src_enable else '' }}deb-src http://security.debian.org/ {{ ansible_lsb.codename }}/updates main
+{% if ansible_facts['distribution_major_version'] | int >= 11 %}
+deb http://security.debian.org/debian-security {{ ansible_lsb.codename }}-security main contrib non-free
+{% else %}
+deb http://security.debian.org/ {{ ansible_lsb.codename }}/updates main contrib non-free
+{% endif %}
+{% if not apt_src_enable %}
+{% if ansible_facts['distribution_major_version'] | int >= 11 %}
+#deb-src http://security.debian.org/debian-security {{ ansible_lsb.codename }}-security main contrib non-free
+{% else %}
+#deb-src http://security.debian.org/ {{ ansible_lsb.codename }}/updates main contrib non-free
+{% endif %}
+{% else %}
+{% if ansible_facts['distribution_major_version'] | int >= 11 %}
+deb-src http://security.debian.org/debian-security {{ ansible_lsb.codename }}-security main contrib non-free
+{% else %}
+deb-src http://security.debian.org/ {{ ansible_lsb.codename }}/updates main contrib non-free
+{% endif %}
+{% endif %}
 
 # {{ ansible_lsb.codename }}-updates, previously known as 'volatile'
 deb {{ apt_debian_mirror }} {{ ansible_lsb.codename }}-updates main
diff --git a/roles/common/templates/etc/samba/smb.conf.j2 b/roles/common/templates/etc/samba/smb.conf.j2
index 29304e1..f83f7f1 100644
--- a/roles/common/templates/etc/samba/smb.conf.j2
+++ b/roles/common/templates/etc/samba/smb.conf.j2
@@ -304,25 +304,56 @@
 {% for item in samba_shares | default([]) %}
 
 [{{ item.name }}]
+{%  if item.comment is defined and item.comment|length > 0 %}
+   comment = {{ item.comment }}
+{%  else %}
    comment = {{ item.name }}
+{% endif %}
    path = {{ item.path }}
 
+{%  if item.browseable is defined and item.browseable|length > 0 %}
+   browseable = {{ item.browseable|string }}
+{%  else %}
    browseable = yes
+{%  endif %}
+{%  if item.read_only is defined and item.read_only|length > 0  %}
+   read only = {{ item.read_only|string }}
+{%  else %}
    read only = no
-   writeable = Yes
+{%  endif %}
+{%  if item.writeable is defined and item.writeable |length > 0 %}
+   writeable = {{ item.writeable }}
+{%  else %}
+   writeable = yes
+{%  endif %}
 
+{%  if item.guest_ok is defined and item.guest_ok|length > 0  %}
+   guest ok = {{ item.guest_ok }}
+
+{%    endif %}
    create mask = {{ item.file_create_mask | default('0660') }}
    force create mode = {{ item.file_create_mask | default('0660') }}
    directory mask = {{ item.dir_create_mask | default('2770') }}
    force directory mode = {{ item.dir_create_mask | default('2770') }}
 
+{%-  if item.valid_users is defined and item.valid_users|length > 0 %}
+
+   # can login into that share
+   valid users = {{ item.valid_users }}
+{%  elif item.group_valid_users is defined and item.group_valid_users|length > 0 %}
+
    # can login into that share
    valid users = @{{ item.group_valid_users }}
+{%    endif %}
+{%-  if item.group_write_list is defined and item.group_write_list|length > 0 %}
+
    # allow to write
    write list = @{{ item.group_write_list }}
 
    force group = +{{ item.group_write_list }}
+{%    endif %}
 {%   if item.vfs_object_recycle is defined and item.vfs_object_recycle|bool %}
+{%      if item.recycle_path is defined and item.recycle_path|length > 0  %}
 
    vfs objects = recycle
    recycle:keeptree = yes
@@ -352,8 +383,13 @@
    # - included in the entry. '*' and '?' can be used to  specify multiple files or
    # - directories as in DOS wildcards.
    # -
-   veto files = /.Trash/
+   veto files = /{{ item.recycle_path | default('@Recycle.Bin') }}/.DS_Store/
    delete veto files = yes
+{%       else %}
+
+{%       endif %}
+{%    else %}
+
 {%    endif %}
 
 {% endfor %}
diff --git a/roles/common/templates/etc/samba/smb.conf.j2.BAK b/roles/common/templates/etc/samba/smb.conf.j2.BAK
new file mode 100644
index 0000000..29304e1
--- /dev/null
+++ b/roles/common/templates/etc/samba/smb.conf.j2.BAK
@@ -0,0 +1,384 @@
+# {{ ansible_managed }}
+
+#
+# Sample configuration file for the Samba suite for Debian GNU/Linux.
+#
+#
+# This is the main Samba configuration file. You should read the
+# smb.conf(5) manual page in order to understand the options listed
+# here. Samba has a huge number of configurable options most of which 
+# are not shown in this example
+#
+# Some options that are often worth tuning have been included as
+# commented-out examples in this file.
+#  - When such options are commented with ";", the proposed setting
+#    differs from the default Samba behaviour
+#  - When commented with "#", the proposed setting is the default
+#    behaviour of Samba but the option is considered important
+#    enough to be mentioned here
+#
+# NOTE: Whenever you modify this file you should run the command
+# "testparm" to check that you have not made any basic syntactic 
+# errors. 
+
+#======================= Global Settings =======================
+
+[global]
+
+## Browsing/Identification ###
+
+# Change this to the workgroup/NT-domain name your Samba server will part of
+;   workgroup = WORKGROUP
+   workgroup = {{ samba_workgroup|default('WORKGROUP') }}
+
+# Option 'netbios name' added to debian's default smb.conf 
+#
+# This sets the NetBIOS name by which a Samba server is known. By default it
+# is the same as the first component of the host's DNS name. If a machine is
+# a browse server or logon server this name (or the first component of the 
+# hosts DNS name) will be the name that these services are advertised under.
+#
+# Note that the maximum length for a NetBIOS name is 15 characters.
+#
+# Default: netbios name =  # machine DNS name
+;   netbios name = FILE
+   netbios name = {{ samba_netbios_name|default('FILE') }}
+
+
+#### Networking ####
+
+# The specific set of interfaces / networks to bind to
+# This can be either the interface name or an IP address/netmask;
+# interface names are normally preferred
+;   interfaces = 127.0.0.0/8 eth0
+   interfaces =  {{ ansible_default_ipv4.address }}/24  127.0.0.1/8
+
+# Option 'hosts deny' and 'hosts allow' added to debian's default smb.conf 
+   hosts deny = 0.0.0.0/0
+   hosts allow = 192.168.0.0/16 10.0.0.0/8 127.0.0.0/8
+
+# Only bind to the named interfaces and/or networks; you must use the
+# 'interfaces' option above to use this.
+# It is recommended that you enable this feature if your Samba machine is
+# not protected by a firewall or is a firewall itself.  However, this
+# option cannot handle dynamic or non-broadcast interfaces correctly.
+#
+# Notice:
+# If bind interfaces only is set and the network address 127.0.0.1 is not added to the 
+# interfaces parameter list smbpasswd(8) may not work as expected due to the reasons 
+# covered below.
+#
+# Default: bind interfaces only = no
+   bind interfaces only = yes
+
+
+#### Debugging/Accounting ####
+
+# This tells Samba to use a separate log file for each machine
+# that connects
+;   log file = /var/log/samba/log.%m
+   log file = /var/log/samba/%I.log
+
+# Cap the size of the individual log files (in KiB).
+;   max log size = 1000
+   max log size = 10000
+
+# We want Samba to only log to /var/log/samba/log.{smbd,nmbd}.
+# Append syslog@1 if you want important messages to be sent to syslog too.
+   logging = file
+
+# Option 'log level' added to debian's default smb.conf 
+#
+# The value of the parameter (a astring) allows the debug level (logging level) to be 
+# specified in the smb.conf file.
+#
+# This parameter has been extended since the 2.2.x series, now it allows one to specify 
+# the debug level for multiple debug classes. This is to give greater flexibility in 
+# the configuration of the system.
+#
+# See manpage for implemented debug classes
+#
+# Default: log level = 0
+#
+# Example: log level = 3 passdb:5 auth:10 winbind:2
+   log level = 0
+
+# Do something sensible when Samba crashes: mail the admin a backtrace
+   panic action = /usr/share/samba/panic-action %d
+
+
+####### Authentication #######
+
+# Option 'ntlm auth' added to debian's default smb.conf 
+#
+# This parameter determines whether or not smbd(8) will attempt to authenticate
+# users using the NTLM encrypted password response for this local passdb (SAM
+# or account database).
+#
+# If disabled, both NTLM and LanMan authencication against the local passdb is
+# disabled.
+#
+# Note that these settings apply only to local users, authentication will still
+# be forwarded to and NTLM authentication accepted against any domain we are
+# joined to, and any trusted domain, even if disabled or if NTLMv2-only is
+# enforced here. To control NTLM authentiation for domain users, this must option
+# must be configured on each DC.
+#
+# By default with lanman auth set to no and ntlm auth set to ntlmv2-only only
+# NTLMv2 logins will be permited. Most clients support NTLMv2 by default, but some
+# older clients will require special configuration to use it.
+#
+# The primary user of NTLMv1 is MSCHAPv2 for VPNs and 802.1x.
+#
+# The available settings are:
+#
+#    ntlmv1-permitted (alias yes) - Allow NTLMv1 and above for all clients.
+#
+#    ntlmv2-only (alias no) - Do not allow NTLMv1 to be used, but permit NTLMv2.
+#
+#    mschapv2-and-ntlmv2-only - Only allow NTLMv1 when the client promises that
+#    it is providing MSCHAPv2 authentication (such as the ntlm_auth tool).
+#
+#    disabled - Do not accept NTLM (or LanMan) authentication of any level, nor
+#    permit NTLM password changes.
+#
+# The default changed from yes to no with Samba 4.5. The default chagned again to
+# ntlmv2-only with Samba 4.7, however the behaviour is unchanged.
+#
+# Default: ntlm auth = ntlmv2-only
+   ntlm auth = ntlmv1-permitted
+
+# Server role. Defines in which mode Samba will operate. Possible
+# values are "standalone server", "member server", "classic primary
+# domain controller", "classic backup domain controller", "active
+# directory domain controller". 
+#
+# Most people will want "standalone server" or "member server".
+# Running as "active directory domain controller" will require first
+# running "samba-tool domain provision" to wipe databases and create a
+# new domain.
+   server role = standalone server
+
+   obey pam restrictions = yes
+
+# This boolean parameter controls whether Samba attempts to sync the Unix
+# password with the SMB password when the encrypted SMB password in the
+# passdb is changed.
+   unix password sync = yes
+
+# For Unix password sync to work on a Debian GNU/Linux system, the following
+# parameters must be set (thanks to Ian Kahan <<kahan@informatik.tu-muenchen.de> for
+# sending the correct chat script for the passwd program in Debian Sarge).
+   passwd program = /usr/bin/passwd %u
+   passwd chat = *Enter\snew\s*\spassword:* %n\n *Retype\snew\s*\spassword:* %n\n *password\supdated\ssuccessfully* .
+
+# This boolean controls whether PAM will be used for password changes
+# when requested by an SMB client instead of the program listed in
+# 'passwd program'. The default is 'no'.
+   pam password change = yes
+
+# This option controls how unsuccessful authentication attempts are mapped
+# to anonymous connections
+   map to guest = bad user
+
+# Option 'username map' added to debian's default smb.conf 
+#
+   username map = /etc/samba/users.map
+
+########## Domains ###########
+
+#
+# The following settings only takes effect if 'server role = primary
+# classic domain controller', 'server role = backup domain controller'
+# or 'domain logons' is set 
+#
+
+# It specifies the location of the user's
+# profile directory from the client point of view) The following
+# required a [profiles] share to be setup on the samba server (see
+# below)
+;   logon path = \\%N\profiles\%U
+# Another common choice is storing the profile in the user's home directory
+# (this is Samba's default)
+#   logon path = \\%N\%U\profile
+
+# The following setting only takes effect if 'domain logons' is set
+# It specifies the location of a user's home directory (from the client
+# point of view)
+;   logon drive = H:
+#   logon home = \\%N\%U
+
+# The following setting only takes effect if 'domain logons' is set
+# It specifies the script to run during logon. The script must be stored
+# in the [netlogon] share
+# NOTE: Must be store in 'DOS' file format convention
+;   logon script = logon.cmd
+
+# This allows Unix users to be created on the domain controller via the SAMR
+# RPC pipe.  The example command creates a user account with a disabled Unix
+# password; please adapt to your needs
+; add user script = /usr/sbin/adduser --quiet --disabled-password --gecos "" %u
+
+# This allows machine accounts to be created on the domain controller via the 
+# SAMR RPC pipe.  
+# The following assumes a "machines" group exists on the system
+; add machine script  = /usr/sbin/useradd -g machines -c "%u machine account" -d /var/lib/samba -s /bin/false %u
+
+# This allows Unix groups to be created on the domain controller via the SAMR
+# RPC pipe.  
+; add group script = /usr/sbin/addgroup --force-badname %g
+
+############ Misc ############
+
+# Using the following line enables you to customise your configuration
+# on a per machine basis. The %m gets replaced with the netbios name
+# of the machine that is connecting
+;   include = /home/samba/etc/smb.conf.%m
+
+# Some defaults for winbind (make sure you're not using the ranges
+# for something else.)
+;   idmap config * :              backend = tdb
+;   idmap config * :              range   = 3000-7999
+;   idmap config YOURDOMAINHERE : backend = tdb
+;   idmap config YOURDOMAINHERE : range   = 100000-999999
+;   template shell = /bin/bash
+
+# Setup usershare options to enable non-root users to share folders
+# with the net usershare command.
+
+# Maximum number of usershare. 0 means that usershare is disabled.
+#   usershare max shares = 100
+
+# Allow users who've been granted usershare privileges to create
+# public shares, not just authenticated ones
+   usershare allow guests = yes
+
+#======================= Share Definitions =======================
+
+# {{ ansible_managed }}
+
+[homes]
+   comment = Home Directories
+   browseable = no
+
+# By default, the home directories are exported read-only. Change the
+# next parameter to 'no' if you want to be able to write to them.
+   read only = no
+
+# File creation mask is set to 0700 for security reasons. If you want to
+# create files with group=rw permissions, set next parameter to 0775.
+   create mask = 0700
+
+# Directory creation mask is set to 0700 for security reasons. If you want to
+# create dirs. with group=rw permissions, set next parameter to 0775.
+   directory mask = 0700
+
+# By default, \\server\username shares can be connected to by anyone
+# with access to the samba server.
+# The following parameter makes sure that only "username" can connect
+# to \\server\username
+# This might need tweaking when using external authentication schemes
+   valid users = %S
+
+# Un-comment the following and create the netlogon directory for Domain Logons
+# (you need to configure Samba to act as a domain controller too.)
+;[netlogon]
+;   comment = Network Logon Service
+;   path = /home/samba/netlogon
+;   guest ok = yes
+;   read only = yes
+
+# Un-comment the following and create the profiles directory to store
+# users profiles (see the "logon path" option above)
+# (you need to configure Samba to act as a domain controller too.)
+# The path below should be writable by all users so that their
+# profile directory may be created the first time they log on
+;[profiles]
+;   comment = Users profiles
+;   path = /home/samba/profiles
+;   guest ok = no
+;   browseable = no
+;   create mask = 0600
+;   directory mask = 0700
+
+{% for item in samba_shares | default([]) %}
+
+[{{ item.name }}]
+   comment = {{ item.name }}
+   path = {{ item.path }}
+
+   browseable = yes
+   read only = no
+   writeable = Yes
+
+   create mask = {{ item.file_create_mask | default('0660') }}
+   force create mode = {{ item.file_create_mask | default('0660') }}
+   directory mask = {{ item.dir_create_mask | default('2770') }}
+   force directory mode = {{ item.dir_create_mask | default('2770') }}
+
+   # can login into that share
+   valid users = @{{ item.group_valid_users }}
+   # allow to write
+   write list = @{{ item.group_write_list }}
+
+   force group = +{{ item.group_write_list }}
+{%   if item.vfs_object_recycle is defined and item.vfs_object_recycle|bool %}
+
+   vfs objects = recycle
+   recycle:keeptree = yes
+   # touch access time from this file
+   # note: this is not the modified time, which is
+   #       outdatet by ls-command
+   # so yo can delete files older then n day with the following command:
+   #    find  /data/samba/share/<share>/.Trash -atime +<n> -exec rm -rf {} \;
+   #
+   recycle:touch = yes
+   recycle:touch_mtime = no
+   recycle:versions = yes
+   recycle:directory_mode = 2770
+
+   # - Dateien gößer als 10MB werden nicht
+   #recycle:maxsize = 10485760  # around 10MB
+
+   # - Keine Begrenzung der Dateigröße.
+   recycle:maxsize = 0
+
+   recycle:exclude = *.tmp,*.temp,*.o,*.obj,~$*,*.~??
+   recycle:excludedir = /tmp,/temp,/cache,.Trash
+   recycle:repository = {{ item.recycle_path | default('@Recycle.Bin') }}
+
+   # - This is a list of files and directories that are neither visible nor accessible. 
+   # - Each entry in the list must be separated by a '/', which allows spaces to be 
+   # - included in the entry. '*' and '?' can be used to  specify multiple files or
+   # - directories as in DOS wildcards.
+   # -
+   veto files = /.Trash/
+   delete veto files = yes
+{%    endif %}
+
+{% endfor %}
+
+;[printers]
+;   comment = All Printers
+;   browseable = no
+;   path = /var/spool/samba
+;   printable = yes
+;   guest ok = no
+;   read only = yes
+;   create mask = 0700
+
+# Windows clients look for this share name as a source of downloadable
+# printer drivers
+;[print$]
+;   comment = Printer Drivers
+;   path = /var/lib/samba/printers
+;   browseable = yes
+;   read only = yes
+;   guest ok = no
+# Uncomment to allow remote administration of Windows print drivers.
+# You may need to replace 'lpadmin' with the name of the group your
+# admin users are members of.
+# Please note that you also need to set appropriate Unix permissions
+# to the drivers directory for these users to have write rights in it
+;   write list = root, @lpadmin
+