diff --git a/roles/container/tasks/main.yaml b/roles/container/tasks/main.yaml
index 5817a30..9f2f280 100644
--- a/roles/container/tasks/main.yaml
+++ b/roles/container/tasks/main.yaml
@@ -22,13 +22,9 @@
   loop_control:
     loop_var: volume
 
-- name: Create secrets for container {{ container_name }}
-  containers.podman.podman_secret:
-    name: "{{ item.name }}"
-    data: "{{ item.value | default(lookup('community.general.random_string', special=false, length=128)) }}"
-    skip_existing: "{{ item.value is not defined }}"
-  no_log: true
-  loop: "{{ container_secrets }}"
+- name: Create secrets
+  ansible.builtin.include_tasks: secrets.yaml
+  when: container_secrets | length > 0
 
 - name: Create container service {{ container_name }}
   containers.podman.podman_container:
diff --git a/roles/container/tasks/secrets.yaml b/roles/container/tasks/secrets.yaml
new file mode 100644
index 0000000..4cd39fb
--- /dev/null
+++ b/roles/container/tasks/secrets.yaml
@@ -0,0 +1,8 @@
+---
+- name: Create secrets for container {{ container_name }}
+  containers.podman.podman_secret:
+    name: "{{ item.name }}"
+    data: "{{ item.value | default(lookup('community.general.random_string', special=false, length=128)) }}"
+    skip_existing: "{{ item.value is not defined }}"
+  no_log: true
+  loop: "{{ container_secrets }}"