diff --git a/files/hugo.openrc b/files/openrc/hugo
similarity index 100%
rename from files/hugo.openrc
rename to files/openrc/hugo
diff --git a/files/webhook.openrc b/files/openrc/webhook
similarity index 100%
rename from files/webhook.openrc
rename to files/openrc/webhook
diff --git a/tasks/main.yml b/tasks/main.yml
index 235c1d1..96cdaf6 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,48 +2,26 @@
 - name: install software
   package: name={{ install_software }} state=present update_cache=yes
 
-- name: generate ssh key
-  openssh_keypair:
-    path: "/root/.ssh/id_rsa"
-    type: rsa
-    size: 2048
-    state: present
-    force: no
-
-- name: read ssh key
-  command: "cat /root/.ssh/id_rsa.pub"
-  register: key
-
-- name: show ssh public key
-  debug: 
-    msg: "{{ key.stdout }}" 
-
 - name: checkout site
   git:
-    repo: https://git.br0tkasten.de/br0tkasten/www.br0tkasten.de.git
+    repo: "{{ hugo_repository }}" 
     dest: /srv/hugo
     version: master
 
-- name: deploy hugo init script
+- name: deploy init scripts
   copy:
-    src: hugo.openrc
-    dest: /etc/init.d/hugo
+    src: "openrc/{{ item }}"
+    dest: "/etc/init.d/{{ item }}"
     mode: 0755
+  with_items:
+    - hugo
+    - webhook
 
-- name: enable hugo service
+- name: start and enable services
   service:
-    name: hugo
+    name: "{{ item }}"
     state: started
     enabled: yes
-
-- name: deploy webhook init script
-  copy:
-    src: webhook.openrc
-    dest: /etc/init.d/webhook
-    mode: 0755
-
-- name: start & enable webhook
-  service:
-    name: webhook
-    state: started
-    enabled: yes 
+  with_items:
+    - hugo
+    - webhook