diff --git a/roles/acertmgr/defaults/main.yml b/roles/acertmgr/defaults/main.yml
index a0de4bc..9bbcbdf 100644
--- a/roles/acertmgr/defaults/main.yml
+++ b/roles/acertmgr/defaults/main.yml
@@ -1,3 +1,3 @@
 ---
 
-acertmgr_version: 0.9.5
+acertmgr_version: 0.9.6
diff --git a/roles/acertmgr/tasks/main.yml b/roles/acertmgr/tasks/main.yml
index 2316821..753e30f 100644
--- a/roles/acertmgr/tasks/main.yml
+++ b/roles/acertmgr/tasks/main.yml
@@ -12,13 +12,10 @@
   git: repo=https://github.com/moepman/acertmgr.git dest=/opt/acertmgr depth=1 version={{ acertmgr_version }}
 
 - name: Create config directories
-  file: path={{ item }} state=directory mode=0755
-  with_items:
-  - /etc/acme
-  - /etc/acme/domains.d
+  file: path=/etc/acertmgr state=directory mode=0755
 
 - name: Configure acertmgr
-  template: src=acme.conf.j2 dest=/etc/acme/acme.conf
+  template: src=acertmgr.conf.j2 dest=/etc/acertmgr/acertmgr.conf
 
 - name: Create challenge directory
   file: path=/var/www/acme-challenge/ owner=root mode=0755 state=directory
diff --git a/roles/acertmgr/templates/acme.conf.j2 b/roles/acertmgr/templates/acertmgr.conf.j2
similarity index 100%
rename from roles/acertmgr/templates/acme.conf.j2
rename to roles/acertmgr/templates/acertmgr.conf.j2