diff --git a/roles/nextcloud-docker/files/nextcloud/app/Dockerfile b/roles/nextcloud-docker/files/nextcloud/app/Dockerfile
index e7dc8a6..3adfaa3 100644
--- a/roles/nextcloud-docker/files/nextcloud/app/Dockerfile
+++ b/roles/nextcloud-docker/files/nextcloud/app/Dockerfile
@@ -1,4 +1,4 @@
-FROM nextcloud:18.0.4-fpm
+FROM nextcloud:18.0.7-fpm
 
 RUN apt-get update && apt-get install -y \
   supervisor \
diff --git a/roles/nextcloud-docker/tasks/main.yml b/roles/nextcloud-docker/tasks/main.yml
index a79ab9b..1a8af29 100644
--- a/roles/nextcloud-docker/tasks/main.yml
+++ b/roles/nextcloud-docker/tasks/main.yml
@@ -39,7 +39,7 @@
   register: db_tables_exist
   retries: 15
   delay: 10
-  until: db_tables_exist.rc == 0
+  until: db_tables_exist is succeeded
   changed_when: no
 
 - name: Restore Nextcloud database