diff --git a/common.yaml b/common.yaml
index 97f699b..d90a0dc 100644
--- a/common.yaml
+++ b/common.yaml
@@ -2,4 +2,5 @@
 
 - hosts: mail.0rpheus.net
   roles:
+    - common
     - haproxy
\ No newline at end of file
diff --git a/hosts.yaml b/hosts.yaml
index 62b8b5c..cb08b70 100644
--- a/hosts.yaml
+++ b/hosts.yaml
@@ -6,6 +6,12 @@ all:
 
   vars:
     ansible_become: false
+
+    admin_mailaddress: micha@0rpheus.net
+    
+    # automated updates
+    Unattended_Upgrade: 1
+    Update_Package_Lists: 1 
   
     certbot_domains:
       - "jabber.0rpheus.net"
diff --git a/roles/common/defaults/main.yaml b/roles/common/defaults/main.yaml
new file mode 100644
index 0000000..e52c7f8
--- /dev/null
+++ b/roles/common/defaults/main.yaml
@@ -0,0 +1,6 @@
+---
+
+etckeeper_message:
+  "changes from Ansible play running as {{ ansible_user_id }}"
+
+sshd_password_authentication: 'no'
\ No newline at end of file
diff --git a/roles/common/handlers/main.yaml b/roles/common/handlers/main.yaml
new file mode 100644
index 0000000..e5c142f
--- /dev/null
+++ b/roles/common/handlers/main.yaml
@@ -0,0 +1,12 @@
+---
+
+- name: reload ssh
+  service: name=ssh state=reloaded
+
+- name: update trusted ca debian
+  shell: /usr/sbin/update-ca-certificates
+  when: ansible_os_family == "Debian"
+
+# handlers for etckeeper
+- name: Record changes in etckeeper
+  shell: "if etckeeper unclean; then etckeeper commit '{{ etckeeper_message }}'; fi"
diff --git a/roles/common/tasks/main.yaml b/roles/common/tasks/main.yaml
new file mode 100644
index 0000000..1647b9d
--- /dev/null
+++ b/roles/common/tasks/main.yaml
@@ -0,0 +1,4 @@
+---
+
+# Install unattended Upgrades
+- import_tasks: updates.yaml
diff --git a/roles/common/tasks/updates.yaml b/roles/common/tasks/updates.yaml
new file mode 100644
index 0000000..cd75ff4
--- /dev/null
+++ b/roles/common/tasks/updates.yaml
@@ -0,0 +1,36 @@
+---
+
+- name: Install unattended Upgrades
+  apt:
+    name:
+      - unattended-upgrades
+      - apt-listchanges
+    state: latest
+  notify: Record changes in etckeeper
+
+
+- name: update Package lists
+  cron:
+    name: update Package lists
+    hour: "{{3|random(seed=inventory_hostname+'updates')}}"
+    minute: "{{59|random(seed=inventory_hostname+'updates')}}"
+    job: /usr/bin/apt-get update > /dev/null
+
+
+- name: generate configs for unattended Upgrades
+  template:
+    src: "{{ item }}"
+    dest: "/etc/apt/apt.conf.d/{{ item }}"
+  with_items:
+    - 20auto-upgrades
+  notify: Record changes in etckeeper
+
+
+- name: configs unattended upgrades
+  template:
+    src: "{{ item }}"
+    dest: "/etc/apt/apt.conf.d/{{ item }}"
+  with_items:
+    - 50unattended-upgrades
+  notify: Record changes in etckeeper
+  when: Unattended_Upgrade == 1
diff --git a/roles/common/templates/20auto-upgrades b/roles/common/templates/20auto-upgrades
new file mode 100644
index 0000000..9f8b1b8
--- /dev/null
+++ b/roles/common/templates/20auto-upgrades
@@ -0,0 +1,2 @@
+APT::Periodic::Update-Package-Lists "{{ Update_Package_Lists }}";
+APT::Periodic::Unattended-Upgrade "{{ Unattended_Upgrade }}";
diff --git a/roles/common/templates/50unattended-upgrades b/roles/common/templates/50unattended-upgrades
new file mode 100644
index 0000000..a6d8056
--- /dev/null
+++ b/roles/common/templates/50unattended-upgrades
@@ -0,0 +1,80 @@
+// #######################################
+// # This file is under ansible control! #
+// #######################################
+
+// Automatically upgrade packages from these (origin:archive) pairs
+Unattended-Upgrade::Allowed-Origins {
+	 "origin=*";
+};
+
+// List of packages to not update (regexp are supported)
+Unattended-Upgrade::Package-Blacklist {
+//	"vim";
+//	"libc6";
+//	"libc6-dev";
+//	"libc6-i686";
+};
+
+// This option allows you to control if on a unclean dpkg exit
+// unattended-upgrades will automatically run
+//   dpkg --force-confold --configure -a
+// The default is true, to ensure updates keep getting installed
+//Unattended-Upgrade::AutoFixInterruptedDpkg "false";
+
+// Split the upgrade into the smallest possible chunks so that
+// they can be interrupted with SIGUSR1. This makes the upgrade
+// a bit slower but it has the benefit that shutdown while a upgrade
+// is running is possible (with a small delay)
+//Unattended-Upgrade::MinimalSteps "true";
+
+// Install all unattended-upgrades when the machine is shuting down
+// instead of doing it in the background while the machine is running
+// This will (obviously) make shutdown slower
+//Unattended-Upgrade::InstallOnShutdown "true";
+
+// Send email to this address for problems or packages upgrades
+// If empty or unset then no email is sent, make sure that you
+// have a working mail setup on your system. A package that provides
+// 'mailx' must be installed. E.g. "user@example.com"
+Unattended-Upgrade::Mail "{{ admin_mailaddress }}";
+
+
+// Set this value to "true" to get emails only on errors. Default
+// is to always send a mail if Unattended-Upgrade::Mail is set
+//Unattended-Upgrade::MailOnlyOnError "true";
+
+// Remove unused automatically installed kernel-related packages
+// (kernel images, kernel headers and kernel version locked tools).
+Unattended-Upgrade::Remove-Unused-Kernel-Packages "true";
+
+
+// Do automatic removal of new unused dependencies after the upgrade
+// (equivalent to apt-get autoremove)
+Unattended-Upgrade::Remove-Unused-Dependencies "true";
+
+// Automatically reboot *WITHOUT CONFIRMATION*
+//  if the file /var/run/reboot-required is found after the upgrade
+Unattended-Upgrade::Automatic-Reboot "false";
+
+// If automatic reboot is enabled and needed, reboot at the specific
+// time instead of immediately
+//  Default: "now"
+//Unattended-Upgrade::Automatic-Reboot-Time "02:00";
+
+// Use apt bandwidth limit feature, this example limits the download
+// speed to 70kb/sec
+//Acquire::http::Dl-Limit "70";
+
+// Enable logging to syslog. Default is False
+Unattended-Upgrade::SyslogEnable "true";
+
+// Specify syslog facility. Default is daemon
+Unattended-Upgrade::SyslogFacility "daemon";
+
+// Download and install upgrades only on AC power
+// (i.e. skip or gracefully stop updates on battery)
+// Unattended-Upgrade::OnlyOnACPower "true";
+
+// Download and install upgrades only on non-metered connection
+// (i.e. skip or gracefully stop updates on a metered connection)
+// Unattended-Upgrade::Skip-Updates-On-Metered-Connections "true";