diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 858475d17..68074626b 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -3352,6 +3352,7 @@ ddclient_enabled: false
 
 ddclient_identifier: matrix-dynamic-dns
 
+ddclient_container_image_registry_prefix: "{{ 'localhost/' if ddclient_container_image_self_build else ddclient_container_image_registry_prefix_upstream }}"
 ddclient_container_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else ddclient_docker_image_registry_prefix_upstream_default }}"
 
 ######################################################################
diff --git a/roles/custom/matrix-dynamic-dns/defaults/main.yml b/roles/custom/matrix-dynamic-dns/defaults/main.yml
index ec955e3ef..efb495de2 100644
--- a/roles/custom/matrix-dynamic-dns/defaults/main.yml
+++ b/roles/custom/matrix-dynamic-dns/defaults/main.yml
@@ -20,16 +20,6 @@ ddclient_daemon_interval: '300'
 # renovate: datasource=docker depName=linuxserver/ddclient versioning=semver
 ddclient_version: 4.0.0
 
-# The docker container to use when in mode
-ddclient_container_image: "{{ ddclient_container_image_registry_prefix }}linuxserver/ddclient:{{ ddclient_version }}"
-
-ddclient_container_image_registry_prefix: "{{ 'localhost/' if ddclient_container_image_self_build else ddclient_container_image_registry_prefix_upstream }}"
-ddclient_container_image_registry_prefix_upstream: "{{ ddclient_container_image_registry_prefix_upstream_default }}"
-ddclient_container_image_registry_prefix_upstream_default: docker.io/
-
-# The image to force pull
-ddclient_container_image_force_pull: "{{ ddclient_container_image.endswith(':latest') }}"
-
 ddclient_container_network: ''
 
 ddclient_container_additional_networks: "{{ ddclient_container_additional_networks_auto + ddclient_container_additional_networks_custom }}"