diff --git a/data/ansible/rpm_packages/cgrates.spec.j2 b/data/ansible/rpm_packages/cgrates.spec.j2
index 660fafb6a..0c67466f6 100644
--- a/data/ansible/rpm_packages/cgrates.spec.j2
+++ b/data/ansible/rpm_packages/cgrates.spec.j2
@@ -1,9 +1,6 @@
 {{ ansible_managed | comment }}
 %global version 0.11.0~dev
-%global branch {{ cgrates_version }}
-%global git_commit {{ gitVersion.stdout_lines[0] }}
 
-%global git_short_commit {{ gitShortVersion.stdout_lines[0] }}
 %define debug_package  %{nil}
 %global _logdir	       /var/log/%name
 %global _spooldir      /var/spool/%name
@@ -15,7 +12,7 @@ Release:        {{ releaseTag }}
 Summary:        Carrier Grade Real-time Charging System
 License:        GPLv3
 URL:            https://github.com/cgrates/cgrates
-Source0:        https://github.com/cgrates/cgrates/archive/%{branch}/%{git_commit}.tar.gz
+Source0:        https://github.com/cgrates/cgrates/archive/{{ cgrates_version }}/{{ gitVersion.stdout_lines[0] }}.tar.gz
 
 %if 0%{?fedora} > 16 || 0%{?rhel} > 6
 Requires(pre): shadow-utils
@@ -34,7 +31,7 @@ CGRateS is a very fast and easy scalable real-time charging system for Telecom e
 %prep
 %setup -q -n %{name}-%{version} -c
 mkdir -p src/github.com/cgrates
-ln -sf ../../../%{name}-%{branch} src/github.com/cgrates/cgrates
+ln -sf ../../../$(ls |grep %{name}-) src/github.com/cgrates/cgrates
 
 %pre
 getent group %{name} >/dev/null || groupadd -r %{name}
diff --git a/data/ansible/rpm_packages/main.yaml b/data/ansible/rpm_packages/main.yaml
index 2f86090a9..cca5dce63 100644
--- a/data/ansible/rpm_packages/main.yaml
+++ b/data/ansible/rpm_packages/main.yaml
@@ -130,6 +130,8 @@
     - name: Import the key in rpm
       become: true
       shell: rpm --import /var/packages/yum.cgrates.org.gpg.key
+      args:
+        warn: false
 
 ###########################################################################################################################
 ###########################################################################################################################
@@ -232,9 +234,9 @@
        
     - name: Download the tar.gz for the last commit
       become: yes
-      shell: wget https://github.com/cgrates/cgrates/archive/{{ cgrates_version }}/{{ gitVersion.stdout_lines[0] }}.tar.gz
-      args:
-        chdir: cgr_build/SOURCES
+      get_url:
+        url: https://github.com/cgrates/cgrates/archive/{{ cgrates_version }}/{{ gitVersion.stdout_lines[0] }}.tar.gz
+        dest: cgr_build/SOURCES/{{ gitVersion.stdout_lines[0] }}.tar.gz
      
     - name: Add cgrates.spec in SPECS
       become: yes
@@ -260,7 +262,8 @@
     
     - name: Sign with rpm --addsign the .rpm file
       become: yes
-      shell: 'sudo rpm --addsign cgr_build/RPMS/x86_64/{{ rmpFileName.stdout_lines[0] }}'
+      shell: 'sudo rpm --addsign cgr_build/RPMS/x86_64/{{ item }}'
+      with_items: "{{ rmpFileName.stdout_lines }}"
       when : cgrates_version == "master" or gitTagVar.stdout_lines|length > 0
       
     - name: Check if is something in /var/packages/yum/{{ cgrates_distribution }}
@@ -277,13 +280,22 @@
     
     - name: Move the files to /var/packages/yum/{{ cgrates_distribution }}
       become: yes
-      command: mv cgr_build/RPMS/x86_64/{{ rmpFileName.stdout_lines[0] }} /var/packages/yum/{{ cgrates_distribution }}/
+      command: mv cgr_build/RPMS/x86_64/{{ item }} /var/packages/yum/{{ cgrates_distribution }}/
+      with_items: "{{ rmpFileName.stdout_lines }}"
       when: (cgrates_version == "master" or gitTagVar.stdout_lines|length > 0) and rmpFileName.stdout_lines|length > 0
  
     - name: Include the package with createrepo
       become: yes
       shell: createrepo /var/packages/yum/{{ cgrates_distribution }}
       when : cgrates_version == "master" or gitTagVar.stdout_lines|length > 0
+
+    - name: Remove rpm files
+      become: yes
+      file:
+        path: cgr_build/RPMS/x86_64/{{ item }}
+        state: absent
+      with_items: "{{ rmpFileName.stdout_lines }}"
+      when: cgrates_version != "master" and gitTagVar.stdout_lines|length == 0
       
 - hosts: pkg
   remote_user: '{{ gouser }}'