diff --git a/data/ansible/roles/install_cgrates/defaults/main.yaml b/data/ansible/roles/cgrates/defaults/main.yaml
similarity index 92%
rename from data/ansible/roles/install_cgrates/defaults/main.yaml
rename to data/ansible/roles/cgrates/defaults/main.yaml
index 36db54999..a8c8aaab3 100644
--- a/data/ansible/roles/install_cgrates/defaults/main.yaml
+++ b/data/ansible/roles/cgrates/defaults/main.yaml
@@ -1,6 +1,5 @@
 ---
 golang_gopath: "/home/{{ ansible_user }}/go"
-clone_repository: true
 cgrates_dir: "{{ golang_gopath }}/src/github.com/cgrates/cgrates"
 golang_install_dir: /usr/local/go
 git_version: "v0.10"
diff --git a/data/ansible/roles/install_cgrates/tasks/main.yaml b/data/ansible/roles/cgrates/tasks/main.yaml
similarity index 73%
rename from data/ansible/roles/install_cgrates/tasks/main.yaml
rename to data/ansible/roles/cgrates/tasks/main.yaml
index 40d57ef24..0e13421ab 100644
--- a/data/ansible/roles/install_cgrates/tasks/main.yaml
+++ b/data/ansible/roles/cgrates/tasks/main.yaml
@@ -13,7 +13,7 @@
     mode: "u=rwx,go=rx"
     owner: "{{ ansible_user }}"
     dest: "{{ cgrates_dir }}"
-  when: "clone_repository|bool"
+  when: clone_repository | default(true)
 
 - name: Git clone cgrates
   ansible.builtin.git:
@@ -22,11 +22,11 @@
     update: yes
     force: yes
     version: "{{ git_version }}"
-  when: "clone_repository|bool"
+  when: clone_repository | default(true)
 
 - name: Build cgrates
-  ansible.builtin.command:
-    cmd: bash -lc "source /etc/profile.d/golang.sh && sh {{ cgrates_dir }}/build.sh"
+  ansible.builtin.shell:
+    cmd: bash -lc "sh {{ cgrates_dir }}/build.sh"
   args:
     chdir: "{{ cgrates_dir }}"
   become_user: "{{ ansible_user }}"
@@ -40,9 +40,13 @@
   loop:
     - { src: "{{ cgrates_dir }}/data", dest: "/usr/share/cgrates" }
     - { src: "{{ golang_gopath }}/bin/cgr-engine", dest: "/usr/bin/cgr-engine" }
+    - { src: "{{ golang_gopath }}/bin/cgr-loader", dest: "/usr/bin/cgr-loader" }
+    - { src: "{{ golang_gopath }}/bin/cgr-migrator", dest: "/usr/bin/cgr-migrator" }
+    - { src: "{{ golang_gopath }}/bin/cgr-console", dest: "/usr/bin/cgr-console" }
+    - { src: "{{ golang_gopath }}/bin/cgr-tester", dest: "/usr/bin/cgr-tester" }
 
 - name: Run post install scripts
-  ansible.builtin.shell:
+  ansible.builtin.command:
     cmd: "{{ item.cmd }}"
     chdir: "{{ cgrates_dir }}/data/storage/{{ item.db }}"
   become: yes
@@ -50,11 +54,9 @@
     - { db: "mysql", cmd: "sh setup_ers_db.sh root CGRateS.org localhost" }
     - { db: "mysql", cmd: "sh setup_cgr_db.sh root CGRateS.org localhost" }
     - { db: "postgres", cmd: "sh setup_cgr_db.sh" }
-    # - { db: "postgres", cmd: "sh create_ers_db.sh" }
+    - { db: "postgres", cmd: "sh create_ers_db.sh" }
     - { db: "mongo", cmd: "sh setup_cgr_db.sh" }
 
 - name: Set versions
-  ansible.builtin.shell:
+  ansible.builtin.command:
     cmd: "cgr-migrator -exec=*set_versions -config_path=/usr/share/cgrates/conf/samples/tutmysql"
-  environment:
-    PATH: "{{ lookup('env','PATH') }}:{{ golang_gopath }}/bin:/usr/local/go/bin:{{ ansible_env.PATH }}"