diff --git a/playbooks/python-tempestconf-tempest-packstack.yaml b/playbooks/python-tempestconf-tempest-packstack.yaml
index 1ecc3396..c4213bf7 100644
--- a/playbooks/python-tempestconf-tempest-packstack.yaml
+++ b/playbooks/python-tempestconf-tempest-packstack.yaml
@@ -2,11 +2,14 @@
   vars:
     test_demo_user: "{{ test_demo is defined }}"
   tasks:
+    # Disable packstack logs copy once packstack deployment finishes
     # packstack-integration-tempest role is inherited from
     # x/packstack project
     - name: Install packstack allinone
-      include_role:
+      import_role:
         name: packstack-integration-tempest
+      environment:
+        COPY_LOGS: false
     # setup-tempest-user, setup-stack-user and setup-devstack-source-dirs
     # are inherited from openstack/devstack
     - name: Setup Stack user
diff --git a/playbooks/upload-logs.yaml b/playbooks/upload-logs.yaml
index 5096e6ba..17b31a6b 100644
--- a/playbooks/upload-logs.yaml
+++ b/playbooks/upload-logs.yaml
@@ -1,5 +1,17 @@
 - hosts: all
   tasks:
+    # Copy openstack logs once tempest run finishes
+    - name: Copy openstack services logs once tempest run finish
+      shell:
+         cmd: |
+           set -e
+           set -x
+           source ./tools/copy-logs.sh
+           recover_default_logs
+         executable: /bin/bash
+         chdir: '{{ ansible_user_dir }}/workspace/packstack'
+      environment: '{{ zuul }}'
+
     - name: Create tempest directory in /tmp/logs
       file:
         path: /tmp/logs/tempest