diff --git a/roles/openxpki/defaults/main.yml b/roles/openxpki/defaults/main.yml
index 4abcdc1..7ee38aa 100644
--- a/roles/openxpki/defaults/main.yml
+++ b/roles/openxpki/defaults/main.yml
@@ -1,12 +1,12 @@
 ---
 
-pki_version: 3.5.8
+pki_version: 3.6.0
 pki_archive_url: https://github.com/openxpki/openxpki/archive/v{{ pki_version }}.tar.gz
-pki_archive_sha1: fc3d6802100592b72586da8a0245787fea6eb860
+pki_archive_sha1: e963447329f9c714716c5feb5bc2669b0135aa94
 
-pki_config_version: 3.4
+pki_config_version: 3.6
 pki_config_archive_url: https://github.com/openxpki/openxpki-config/archive/v{{ pki_config_version }}.tar.gz
-pki_config_archive_sha1: 3ccbb822fa8d41802394e550775282a662e837d1
+pki_config_archive_sha1: 22178afe883e636aebb607952c297e944cfe0023
 
 # Should ansible handle updates or only initial install
 pki_manage_upgrade: True
diff --git a/roles/openxpki/tasks/conf.yml b/roles/openxpki/tasks/conf.yml
index a86990d..9ebff5f 100644
--- a/roles/openxpki/tasks/conf.yml
+++ b/roles/openxpki/tasks/conf.yml
@@ -4,6 +4,16 @@
   template: src=localconfig.js.j2 dest={{ pki_root_dir }}/web/htdocs/localconfig.js
   tags: pki
 
+- name: Check if notification is a link or a dir
+  stat: path={{ pki_root_dir }}/etc/notification
+  register: pki_notif_config
+  tags: pki
+
+- name: Remove notification dir from the config
+  file: path={{ pki_root_dir }}/etc/notification state=absent
+  when: pki_notif_config.stat.isdir
+  tags: pki
+
 - name: Copy default configuration
   synchronize:
     src: "{{ pki_root_dir }}/src/openxpki-config-{{ pki_config_version }}/"