diff --git a/ansible/install.yml b/ansible/install.yml
index 8dc1f878..a4581fdd 100644
--- a/ansible/install.yml
+++ b/ansible/install.yml
@@ -5,8 +5,7 @@
 - hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') }}"
   roles:
     - install
-    - {role: generic-service-prepare, when: service == 'tendermint'}
+    - {role: generic-service, when: service == 'tendermint'}
     - {role: config, testnet_name: "{{lookup('env','TF_VAR_TESTNET_NAME')}}"}
-    - {role: generic-service-config, when: service == 'tendermint'}
     - start
 
diff --git a/ansible/roles/generic-service-config/tasks/main.yml b/ansible/roles/generic-service-config/tasks/main.yml
deleted file mode 100644
index 3eca682e..00000000
--- a/ansible/roles/generic-service-config/tasks/main.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- name: here
-  file: "path=/etc/{{service}}/tendermint state=absent"
-- name: Create tendermint directory
-  file: "path=/etc/{{service}}/tendermint state=directory mode=0755 owner={{service}} group={{service}}"
-
-- name: Initialize tendermint
-  command: "/usr/bin/tendermint init --home /etc/{{service}}/tendermint"
-  become: yes
-  become_user: "{{service}}"
-
diff --git a/ansible/roles/generic-service-prepare/tasks/main.yml b/ansible/roles/generic-service/tasks/main.yml
similarity index 61%
rename from ansible/roles/generic-service-prepare/tasks/main.yml
rename to ansible/roles/generic-service/tasks/main.yml
index 0730d6a0..d7a2e015 100644
--- a/ansible/roles/generic-service-prepare/tasks/main.yml
+++ b/ansible/roles/generic-service/tasks/main.yml
@@ -15,3 +15,11 @@
 - name: Reload systemd services
   systemd: "name={{service}} daemon_reload=yes enabled=no"
 
+- name: Create tendermint directory
+  file: "path=/etc/{{service}}/tendermint state=directory mode=0755 owner={{service}} group={{service}}"
+
+- name: Initialize tendermint
+  command: "/usr/bin/tendermint init --home /etc/{{service}}/tendermint"
+  become: yes
+  become_user: "{{service}}"
+
diff --git a/ansible/roles/generic-service-prepare/templates/systemd.service.j2 b/ansible/roles/generic-service/templates/systemd.service.j2
similarity index 100%
rename from ansible/roles/generic-service-prepare/templates/systemd.service.j2
rename to ansible/roles/generic-service/templates/systemd.service.j2