diff --git a/roles/apps/handlers/main.yml b/roles/apps/handlers/main.yml
index 360f780..7c433fe 100644
--- a/roles/apps/handlers/main.yml
+++ b/roles/apps/handlers/main.yml
@@ -1,7 +1,9 @@
 ---
 
 - name: restart-nextcloud
-  docker_container:
+  community.docker.docker_container:
     name: "{{ nextcloud_container_name }}"
     state: started
-    restart: yes
+    restart: true
+    comparisons:
+      '*': ignore
diff --git a/roles/apps/tasks/main.yml b/roles/apps/tasks/main.yml
index a12ed89..e63ab11 100644
--- a/roles/apps/tasks/main.yml
+++ b/roles/apps/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: Ensure nextcloud user is created
-  user:
+  ansible.builtin.user:
     name: "{{ nextcloud_run_user }}"
     state: present
   register: nextcloud_user_res