diff --git a/pkg_upgrade.yml b/pkg_upgrade.yml
deleted file mode 100644
index 32b6ad3..0000000
--- a/pkg_upgrade.yml
+++ /dev/null
@@ -1,50 +0,0 @@
----
-- name: Linux Package Upgrade
-  hosts: all
-  remote_user: root
-  tasks:
-    - name: "[Debian] Refresh Package Cache if not older that 1h"
-      apt:
-        update_cache: yes
-        cache_valid_time: 3600
-      become: true
-      when: ansible_os_family == "Debian"
-
-    - name: "[AlmaLinux] Refresh Package Cache if not older that 1h"
-      dnf:
-        update_cache: yes
-      become: true
-      when: ansible_os_family == "AlmaLinux"
-
-    - name: "[Debian] Remove Packages that can no longer be downloaded"
-      apt:
-        autoclean: yes
-      become: true
-      when: ansible_os_family == "Debian"
-
-    - name: "[Debian] Remove packages that are no longer required"
-      apt:
-        autoremove: yes
-      become: true
-      when: ansible_os_family == "Debian"
-
-    - name: "[AlmaLinux] Remove packages that are no longer required"
-      dnf:
-        autoremove: yes
-      become: true
-      when: ansible_os_family == "AlmaLinux"
-
-    - name: "[Debian] Upgrade all packages that need an update"
-      apt:
-        upgrade: full
-      become: true
-      when: ansible_os_family == "Debian"
-
-    - name: "[AlmaLinux] Upgrade all packages that need an update"
-      dnf:
-        name: "*"
-        state: latest
-      become: true
-      when: ansible_os_family == "AlmaLinux"
-...        
-
diff --git a/playbooks/pkg_upgrade.yml b/playbooks/pkg_upgrade.yml
index 2f7c534..32b6ad3 100644
--- a/playbooks/pkg_upgrade.yml
+++ b/playbooks/pkg_upgrade.yml
@@ -3,25 +3,48 @@
   hosts: all
   remote_user: root
   tasks:
-    - name: Refresh Package Cache if not older that 1h
+    - name: "[Debian] Refresh Package Cache if not older that 1h"
       apt:
         update_cache: yes
         cache_valid_time: 3600
       become: true
+      when: ansible_os_family == "Debian"
 
-    - name: Remove Packages that can no longer be downloaded
+    - name: "[AlmaLinux] Refresh Package Cache if not older that 1h"
+      dnf:
+        update_cache: yes
+      become: true
+      when: ansible_os_family == "AlmaLinux"
+
+    - name: "[Debian] Remove Packages that can no longer be downloaded"
       apt:
         autoclean: yes
       become: true
+      when: ansible_os_family == "Debian"
 
-    - name: Remove packages that are no longer required
+    - name: "[Debian] Remove packages that are no longer required"
       apt:
         autoremove: yes
       become: true
+      when: ansible_os_family == "Debian"
 
-    - name: Upgrade all packages that need an update
+    - name: "[AlmaLinux] Remove packages that are no longer required"
+      dnf:
+        autoremove: yes
+      become: true
+      when: ansible_os_family == "AlmaLinux"
+
+    - name: "[Debian] Upgrade all packages that need an update"
       apt:
         upgrade: full
       become: true
+      when: ansible_os_family == "Debian"
+
+    - name: "[AlmaLinux] Upgrade all packages that need an update"
+      dnf:
+        name: "*"
+        state: latest
+      become: true
+      when: ansible_os_family == "AlmaLinux"
 ...        
 
diff --git a/roles/awx/defaults/main.yml b/roles/awx/defaults/main.yml
index 82a8c19..5f8c5b4 100644
--- a/roles/awx/defaults/main.yml
+++ b/roles/awx/defaults/main.yml
@@ -53,6 +53,7 @@ pg_port: 5432
 pg_username: 'awxuser'
 pg_database: 'awx'
 pg_password: 'awxpassw0rd'
+pg_database_dumpdir: "{{ awx_composedir }}/backup"
 #
 # Number of AWX containers. If set to 1, no haproxy is deployed
 #