diff --git a/roles/nextcloud/README.md b/roles/nextcloud/README.md
index e816d2a1..25523bc8 100644
--- a/roles/nextcloud/README.md
+++ b/roles/nextcloud/README.md
@@ -77,7 +77,7 @@ Build with Docker.
 
 ```bash
 cd /srv/build/nextcloud01
-docker build . -t nextcloud:custom
+docker build . -t nextcloud:nextcloud01
 ```
 
 ### Internal Server Error
diff --git a/roles/nextcloud/tasks/nextcloud_build.yml b/roles/nextcloud/tasks/nextcloud_build.yml
index b2a91ced..7c7ae312 100644
--- a/roles/nextcloud/tasks/nextcloud_build.yml
+++ b/roles/nextcloud/tasks/nextcloud_build.yml
@@ -1,7 +1,7 @@
 ---
 - name: Ensure {{ role_name }} build dir exists
   ansible.builtin.file:
-    path: "{{ docker_build_dir }}/{{ nextcloud_hostname }}/providers"
+    path: "{{ docker_build_dir }}/{{ nextcloud_hostname }}"
     state: directory
 
 - name: Copy {{ role_name }} Dockerfile
diff --git a/roles/nextcloud/templates/Dockerfile b/roles/nextcloud/templates/Dockerfile
index 434f8bee..cbc19ab0 100644
--- a/roles/nextcloud/templates/Dockerfile
+++ b/roles/nextcloud/templates/Dockerfile
@@ -1,4 +1,4 @@
-FROM {{ nextcloud_image }}
+FROM {{ nextcloud_build_image }}
 RUN apt update
 RUN apt install -y smbclient libsmbclient-dev
 RUN pecl install smbclient
diff --git a/roles/rabbitmq/handlers/main.yml b/roles/rabbitmq/handlers/main.yml
index c23f157c..f5c95603 100644
--- a/roles/rabbitmq/handlers/main.yml
+++ b/roles/rabbitmq/handlers/main.yml
@@ -6,7 +6,7 @@
 
 - name: Build {{ role_name }} custom image
   community.docker.docker_image:
-    name: rabbitmq:custom
+    name: "{{ rabbitmq_image }}"
     build:
       path: "{{ docker_build_dir }}/{{ rabbitmq_hostname }}"
       pull: true