diff --git a/httpd.yml b/httpd.yml
deleted file mode 100644
index 73dcebf..0000000
--- a/httpd.yml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-- hosts: tau
-  become: true
-
-  vars:
-    - server_admin: "admin@netz39.de"
-
-
-  tasks:
-    - name: Update and clean package cache
-      apt:
-        update_cache: true
-        cache_valid_time: 3600
-        autoclean: true
-
-    - name: Ensure Apache2 and modules are installed and up to date
-      apt:
-        name:
-          - apache2
-        state: latest
-
-    - name: Ensure mod_rewrite is enabled
-      apache2_module:
-        name: rewrite
-        state: present
-
-
-    - name: Setup proxy site testredmine.netz39.de
-      include_role:
-        name: setup-http-site-proxy
-      vars:
-        site_name: testredmine.netz39.de
-        proxy_port: 9004
diff --git a/main.yml b/main.yml
new file mode 100644
index 0000000..fa26049
--- /dev/null
+++ b/main.yml
@@ -0,0 +1,35 @@
+---
+- hosts: tau
+  become: true
+
+  vars:
+    - server_admin: "admin@netz39.de"
+    - ag_timezone: Europe/Berlin
+
+  roles:
+  - role: ansible.timezone
+
+  tasks:
+    - name: Update and clean package cache
+      apt:
+        update_cache: true
+        cache_valid_time: 3600
+        autoclean: true
+
+    - name: Ensure unattended-upgrades is installed and up to date
+      apt:
+        name: unattended-upgrades
+        state: latest
+
+    - name: Setup unattended-upgrades
+      include_role:
+        name: ansible-role-unattended-upgrades
+      vars:
+        unattended_origins_patterns:
+          - 'origin=Debian,archive=buster-security'
+          - 'o=Debian,a=buster-updates'
+        unattended_package_blacklist: [cowsay]
+        unattended_mail: 'root'
+
+    - name: Setup httpd
+      include_tasks: tasks/httpd.yml
diff --git a/requirements.yml b/requirements.yml
new file mode 100644
index 0000000..36978db
--- /dev/null
+++ b/requirements.yml
@@ -0,0 +1,4 @@
+- src: git+https://github.com/jnv/ansible-role-unattended-upgrades.git
+  version: v1.9.0
+- src: git+https://github.com/adriagalin/ansible.timezone.git
+  version: 3.0.0
diff --git a/tasks/httpd.yml b/tasks/httpd.yml
new file mode 100644
index 0000000..8b3f71d
--- /dev/null
+++ b/tasks/httpd.yml
@@ -0,0 +1,19 @@
+---
+- name: Ensure Apache2 and modules are installed and up to date
+  apt:
+    name:
+      - apache2
+    state: latest
+
+- name: Ensure mod_rewrite is enabled
+  apache2_module:
+    name: rewrite
+    state: present
+
+
+- name: Setup proxy site testredmine.netz39.de
+  include_role:
+    name: setup-http-site-proxy
+  vars:
+    site_name: testredmine.netz39.de
+    proxy_port: 9004