diff --git a/roles/4-server-options/tasks/main.yml b/roles/4-server-options/tasks/main.yml
index bc933e102..ca77dc010 100644
--- a/roles/4-server-options/tasks/main.yml
+++ b/roles/4-server-options/tasks/main.yml
@@ -67,27 +67,5 @@
   command: /usr/bin/iiab-refresh-wiki-docs
   when: not nodocs
 
-- name: Stop postgresql service
-  command: "/etc/init.d/postgresql stop"
-  ignore_errors: True
-  when: postgresql_install and is_debuntu
-
-- name: Start postgresql service
-  service: name=postgresql-iiab
-           state=restarted
-           enabled=yes
-  when: postgresql_enabled
-
-- name: Stop authserver service
-  service: name=xs-authserver
-           state=stopped
-           enabled=no
-  when: not authserver_enabled and authserver_install
-
-- name: Start xs-authserver service
-  service: name=xs-authserver
-           state=restarted
-  when: authserver_enabled
-
 - name: ...WAS COMPLETED ===========================================]
   command: echo
diff --git a/roles/authserver/tasks/main.yml b/roles/authserver/tasks/main.yml
index 11e34c91f..304c72392 100644
--- a/roles/authserver/tasks/main.yml
+++ b/roles/authserver/tasks/main.yml
@@ -38,8 +38,15 @@
   environment:
     XS_AUTHSERVER_DATABASE: /var/lib/xs-authserver/data.db
 
-- name: Enable xs-authserver service
+- name: Stop authserver service
   service: name=xs-authserver
+           state=stopped
+           enabled=no
+  when: not authserver_enabled
+
+- name: Start xs-authserver service
+  service: name=xs-authserver
+           state=restarted
            enabled=yes
   when: authserver_enabled
 
diff --git a/roles/postgresql/tasks/main.yml b/roles/postgresql/tasks/main.yml
index ac125b67a..73321bf7d 100644
--- a/roles/postgresql/tasks/main.yml
+++ b/roles/postgresql/tasks/main.yml
@@ -64,6 +64,11 @@
             group=postgres
             mode=0640
 
+- name: Stop postgresql service
+  command: "/etc/init.d/postgresql stop"
+  ignore_errors: True
+  when: postgresql_install and is_debuntu
+
 - name: Stop and disable stock postgresql service
   service: name=postgresql
            state=stopped
@@ -75,6 +80,12 @@
            enabled=yes
   when: postgresql_enabled
 
+- name: Stop and disable postgresql-iiab service
+  service: name=postgresql
+           state=stopped
+           enabled=no
+  when: not postgresql_enabled
+
 - name: Add postgresql to service list
   ini_file: dest='{{ service_filelist }}'
             section=postgresql