diff --git a/roles/podman/defaults/main.yml b/roles/podman/defaults/main.yml
index 77db054..8a20430 100644
--- a/roles/podman/defaults/main.yml
+++ b/roles/podman/defaults/main.yml
@@ -7,15 +7,15 @@ podman_nfs_share_path: "/mnt/data/podman" # Ersetzen Sie dies durch den Pfad Ihr
 podman_data_mount_point: "/opt/podman" # Lokaler Mount-Punkt für den NFS-Share
 
 # Portainer configuration
-portainer_data_path: "{{ podman_data_mount_point }}/portainer" # Pfad für Portainers persistente Daten
-portainer_image: "portainer/portainer-ce:latest"
+portainer_data_path: "{{ podman_data_mount_point }}/portainer/data" # Pfad für Portainers persistente Daten
+portainer_image: "docker.io/portainer/portainer-ce:latest"
 portainer_name: "portainer"
 portainer_web_port: 9443 # Port für die Portainer Web-Oberfläche (HTTPS)
 portainer_edge_agent_port: 8000 # Port für den Portainer Edge Agent
 portainer_legacy_port: 9000 # Portainer's alter Standard-Port (HTTP), oft noch exponiert
 
 # Portainer Agent configuration
-portainer_agent_image: "portainer/agent:latest"
+portainer_agent_image: "docker.io/portainer/agent:latest"
 portainer_agent_name: "portainer-agent"
 portainer_agent_port: 9001 # Port für den Portainer Agent
 
diff --git a/roles/podman/tasks/main.yml b/roles/podman/tasks/main.yml
index d358709..70b0910 100644
--- a/roles/podman/tasks/main.yml
+++ b/roles/podman/tasks/main.yml
@@ -55,8 +55,8 @@
 
 - name: Create Portainer compose file from template
   ansible.builtin.template:
-    src: portainer-compose.yml.j2
-    dest: "{{ podman_data_mount_point }}/compose/portainer/compose.yml"
+    src: portainer-compose.yaml.j2
+    dest: "{{ podman_data_mount_point }}/compose/portainer/compose.yaml"
     mode: '0644'
 
 - name: Start Portainer container using podman-compose
diff --git a/roles/podman/templates/portainer-compose.yml.j2 b/roles/podman/templates/portainer-compose.yaml.j2
similarity index 83%
rename from roles/podman/templates/portainer-compose.yml.j2
rename to roles/podman/templates/portainer-compose.yaml.j2
index 9fa1c02..458a9a8 100644
--- a/roles/podman/templates/portainer-compose.yml.j2
+++ b/roles/podman/templates/portainer-compose.yaml.j2
@@ -10,7 +10,7 @@ services:
       - "{{ portainer_legacy_port }}:9000"
       - "{{ portainer_web_port }}:9443"
     volumes:
-      - "podman.sock:/var/run/docker.sock"
+      - "/var/run/podman/podman.sock:/var/run/docker.sock"
       - "{{ portainer_data_path }}:/data"
     restart: always
 
@@ -20,6 +20,6 @@ services:
     ports:
       - "{{ portainer_agent_port }}:9001"
     volumes:
-      - "podman.sock:/var/run/docker.sock"
+      - "/var/run/podman/podman.sock:/var/run/docker.sock"
       - "{{ podman_data_mount_point }}:/var/lib/containers"
     restart: always
\ No newline at end of file