diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 3d4446c25..858475d17 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -3352,7 +3352,7 @@ ddclient_enabled: false
 
 ddclient_identifier: matrix-dynamic-dns
 
-ddclient_docker_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 }}"
+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 f5b3955fe..ec955e3ef 100644
--- a/roles/custom/matrix-dynamic-dns/defaults/main.yml
+++ b/roles/custom/matrix-dynamic-dns/defaults/main.yml
@@ -21,14 +21,14 @@ ddclient_daemon_interval: '300'
 ddclient_version: 4.0.0
 
 # The docker container to use when in mode
-ddclient_docker_image: "{{ ddclient_docker_image_registry_prefix }}linuxserver/ddclient:{{ ddclient_version }}"
+ddclient_container_image: "{{ ddclient_container_image_registry_prefix }}linuxserver/ddclient:{{ ddclient_version }}"
 
-ddclient_docker_image_registry_prefix: "{{ 'localhost/' if ddclient_container_image_self_build else ddclient_docker_image_registry_prefix_upstream }}"
-ddclient_docker_image_registry_prefix_upstream: "{{ ddclient_docker_image_registry_prefix_upstream_default }}"
-ddclient_docker_image_registry_prefix_upstream_default: docker.io/
+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_docker_image_force_pull: "{{ ddclient_docker_image.endswith(':latest') }}"
+ddclient_container_image_force_pull: "{{ ddclient_container_image.endswith(':latest') }}"
 
 ddclient_container_network: ''
 
diff --git a/roles/custom/matrix-dynamic-dns/tasks/validate_config.yml b/roles/custom/matrix-dynamic-dns/tasks/validate_config.yml
index e107fc60a..3460891c0 100644
--- a/roles/custom/matrix-dynamic-dns/tasks/validate_config.yml
+++ b/roles/custom/matrix-dynamic-dns/tasks/validate_config.yml
@@ -27,11 +27,3 @@
   when: "item.when | bool and lookup('vars', item.name, default='') | string | length == 0"
   with_items:
     - {'name': 'ddclient_container_network', when: true}
-
-- name: (Deprecation) Catch and report renamed matrix-dynamic-dns variables
-  ansible.builtin.fail:
-    msg: >-
-      The variable `{{ item.old }}` is deprecated. Please use `{{ item.new }}` instead.
-  when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0"
-  with_items:
-    - {'old': 'ddclient_container_image_name_prefix', 'new': 'ddclient_docker_image_registry_prefix'}
diff --git a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml
index 502424679..0598279a3 100644
--- a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml
+++ b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml
@@ -80,6 +80,11 @@
     - {'old': 'cinny_docker_image_registry_prefix_upstream', 'new': 'cinny_container_image_registry_prefix_upstream'}
     - {'old': 'cinny_docker_image_registry_prefix_upstream_default', 'new': 'cinny_container_image_registry_prefix_upstream_default'}
 
+    - {'old': 'ddclient_docker_image', 'new': 'ddclient_container_image'}
+    - {'old': 'ddclient_docker_image_registry_prefix', 'new': 'ddclient_container_image_registry_prefix'}
+    - {'old': 'ddclient_docker_image_registry_prefix_upstream', 'new': 'ddclient_container_image_registry_prefix_upstream'}
+    - {'old': 'ddclient_docker_image_registry_prefix_upstream_default', 'new': 'ddclient_container_image_registry_prefix_upstream_default'}
+
 - name: (Deprecation) Catch and report matrix_postgres variables
   ansible.builtin.fail:
     msg: |-