diff --git a/roles/build-test-packages/tasks/dlrn-build.yml b/roles/build-test-packages/tasks/dlrn-build.yml
index f123ea94c..590d87931 100644
--- a/roles/build-test-packages/tasks/dlrn-build.yml
+++ b/roles/build-test-packages/tasks/dlrn-build.yml
@@ -68,7 +68,7 @@
 
 - block:
     - name: Map project name to DLRN project name
-      register: project_name_mapped
+      register: project_name_mapped_rdoinfo
       shell:
         chdir: '{{ build_repo_dir }}/DLRN'
         cmd: |
@@ -80,26 +80,29 @@
             -i {{ rdoinfo_repo_name }}/{{ rdoinfo_repo_name.split('info')[0] }}-full.yml | \
             awk '/^name/{print $2}; {print "findpkg: " $0 > "/dev/stderr"}'
       changed_when: false
-      failed_when: project_name_mapped.rc != 0 or not project_name_mapped.stdout
+      failed_when: project_name_mapped_rdoinfo.rc != 0 or not project_name_mapped_rdoinfo.stdout
 
-  rescue:
+  always:
     - debug:
         msg: |
-          WARNING: Got {{ project_name_mapped.rc }} result code trying to build {{ artg_change.project }}
+          WARNING: Got {{ project_name_mapped_rdoinfo.rc }} result code trying to build {{ artg_change.project }}
           --- STDERR ---
-          {{ project_name_mapped.stderr }}
+          {{ project_name_mapped_rdoinfo.stderr }}
           --- STDOUT ---
-          {{ project_name_mapped.stdout }}
+          {{ project_name_mapped_rdoinfo.stdout }}
 
-- when: project_name_mapped is success
-  block:
+- name: set project name mapped
+  set_fact:
+    project_name_mapped: "{{ artg_change.project_name_mapped | default(project_name_mapped_rdoinfo.stdout) }}"
+
+- block:
     - name: Append project name to package list
       set_fact:
-        artg_rdo_packages: '{{ artg_rdo_packages }} + {{ [ project_name_mapped.stdout ] }}'
+        artg_rdo_packages: '{{ artg_rdo_packages }} + {{ [ project_name_mapped ] }}'
 
-    - name: Check if project {{ project_name_mapped.stdout }} source already exist
+    - name: Check if project {{ project_name_mapped }} source already exist
       stat:
-        path: '{{ build_repo_dir }}/DLRN/data/{{ project_name_mapped.stdout }}/.git'
+        path: '{{ build_repo_dir }}/DLRN/data/{{ project_name_mapped }}/.git'
       register: repo_status
 
     - name: Create data directory if doesn't exist yet
@@ -110,7 +113,7 @@
     - name: Copy from ready directories if configured
       command: >
         cp -raf {{ artg_repos_dir | dirname  }}/{{ artg_change.project }}
-        {{ build_repo_dir }}/DLRN/data/{{ project_name_mapped.stdout }}
+        {{ build_repo_dir }}/DLRN/data/{{ project_name_mapped }}
       ignore_errors: true
       register: copy_dir
       when: artg_repos_dir is defined
@@ -118,7 +121,7 @@
     - name: Clone the gated change
       git:
         repo: '{{ artg_change.host }}/{{ artg_change.project }}'
-        dest: '{{ build_repo_dir }}/DLRN/data/{{ project_name_mapped.stdout }}'
+        dest: '{{ build_repo_dir }}/DLRN/data/{{ project_name_mapped }}'
         refspec: '{{ artg_change.refspec }}'
         version: 'FETCH_HEAD'
       when:
@@ -128,7 +131,7 @@
 
     - name: Cleanup and checkout the relevant branch
       vars:
-        git_path: '{{ build_repo_dir }}/DLRN/data/{{ project_name_mapped.stdout }}'
+        git_path: '{{ build_repo_dir }}/DLRN/data/{{ project_name_mapped }}'
         git_branch: '{{ artg_change.branch }}'
       shell: |
         set -eu
@@ -137,16 +140,17 @@
         git reset --hard HEAD
         git checkout {{ git_branch }}
         popd
+      when: artg_repos_dir is defined
 
     - name: Ensure distgit repo is absent, DLRN takes care of cloning based on config
       file:
-        path: "{{ build_repo_dir }}/DLRN/data/{{ project_name_mapped.stdout }}_distro"
+        path: "{{ build_repo_dir }}/DLRN/data/{{ project_name_mapped }}_distro"
         state: absent
 
     - name: Clone the distgit change
       git:
         repo: '{{ artg_change.distgit.host }}/{{ artg_change.distgit.project }}'
-        dest: '{{ build_repo_dir }}/DLRN/data/{{ project_name_mapped.stdout }}_distro'
+        dest: '{{ build_repo_dir }}/DLRN/data/{{ project_name_mapped }}_distro'
         refspec: '{{ artg_change.distgit.refspec }}'
         version: 'FETCH_HEAD'
         accept_hostkey: true
@@ -162,7 +166,7 @@
 
     - name: Print info about building
       debug:
-        msg: "Building change for {{ project_name_mapped.stdout|default('unknown') }}"
+        msg: "Building change for {{ project_name_mapped|default('unknown') }}"
 
     - name: Run DLRN
       shell: >
diff --git a/roles/build-test-packages/templates/run_dlrn.sh.j2 b/roles/build-test-packages/templates/run_dlrn.sh.j2
index 7c3758c94..6478f18e1 100644
--- a/roles/build-test-packages/templates/run_dlrn.sh.j2
+++ b/roles/build-test-packages/templates/run_dlrn.sh.j2
@@ -3,7 +3,7 @@ set +e
 cd {{ build_repo_dir }}/DLRN
 source {{ build_repo_dir }}/dlrn-venv/bin/activate;
 {% if artg_build_one|bool %}
-export PKG={{ project_name_mapped.stdout }}
+export PKG={{ project_name_mapped }}
 {% else %}
 export PKG="{{ artg_rdo_packages|join(' --package-name ') }}"
 {% endif %}