diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index d623b5421d..4b1e63323e 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -548,7 +548,7 @@ resources:
 {%- if role.deprecated_param_extraconfig is defined %}
               - {get_param: {{role.deprecated_param_extraconfig}}}
 {%- endif %}
-              - {get_param: {{server_resource_name}}ExtraConfig}
+              - {get_param: {{role.name}}ExtraConfig}
           extraconfig: {get_param: ExtraConfig}
           {{role.name.lower()}}:
             tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
diff --git a/releasenotes/notes/use-role-name-ExtraConfig-with-deprecations-2688f34fbc6de74a.yaml b/releasenotes/notes/use-role-name-ExtraConfig-with-deprecations-2688f34fbc6de74a.yaml
new file mode 100644
index 0000000000..8bb0741176
--- /dev/null
+++ b/releasenotes/notes/use-role-name-ExtraConfig-with-deprecations-2688f34fbc6de74a.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    ``{{role.name}}ExtraConfig`` will now be honored even when using deprecated
+    params in roles_data.yaml. Previously, its value was ignored and never used
+    even though it is defined as a valid parameter in the rendered template.