diff --git a/roles/tpa_single_node/defaults/main.yml b/roles/tpa_single_node/defaults/main.yml
index 9c759a2..2580150 100644
--- a/roles/tpa_single_node/defaults/main.yml
+++ b/roles/tpa_single_node/defaults/main.yml
@@ -1,13 +1,4 @@
 ---
-# defaults file for tpa_single_node
-tpa_single_node_system_packages:
-  - podman
-  - podman-plugins
-  # @postgres-remove
-  - postgresql
-  - postgresql-server
-  - python3-pip
-  - python3-cryptography
 # Storage Service
 tpa_single_node_storage_type: minio # Either s3 or minio or other s3 compatible
 tpa_single_node_storage_region: eu-west-1 # <AWS S3 Storage region> # For Minio just keep eu-west-1
diff --git a/roles/tpa_single_node/vars/main.yml b/roles/tpa_single_node/vars/main.yml
index 0f2df10..3cffd46 100644
--- a/roles/tpa_single_node/vars/main.yml
+++ b/roles/tpa_single_node/vars/main.yml
@@ -86,3 +86,13 @@ tpa_single_node_bombastic_walker_suspended: true
 tpa_single_node_dataset_job_suspended: true
 tpa_single_node_vexination_walker_suspended: true
 tpa_single_node_v11y_walker_suspended: false
+
+# defaults file for tpa_single_node
+tpa_single_node_system_packages:
+  - podman
+  - podman-plugins
+  # @postgres-remove
+  - postgresql
+  - postgresql-server
+  - python3-pip
+  - python3-cryptography