diff --git a/roles/tackle/defaults/main.yml b/roles/tackle/defaults/main.yml
index e2dc5d5..af74aa3 100644
--- a/roles/tackle/defaults/main.yml
+++ b/roles/tackle/defaults/main.yml
@@ -172,7 +172,7 @@ provider_python_container_requests_cpu: "1"
 provider_python_container_requests_memory: "1Gi"
 provider_python_image_fqin: "{{ lookup('env', 'RELATED_IMAGE_PROVIDER_GENERIC') }}"
 provider_python_name: "python"
-provider_python_service_name: "{{ app_name }}-{{ provider_python_name }}-{{ analyzer_component_name }}"
+provider_python_service_name: "{{ app_name }}-{{ provider_python_name }}-{{ provider_python_component_name }}"
 
 provider_nodejs_component_name: "extension"
 provider_nodejs_container_limits_cpu: "1"
@@ -181,7 +181,7 @@ provider_nodejs_container_requests_cpu: "1"
 provider_nodejs_container_requests_memory: "1Gi"
 provider_nodejs_image_fqin: "{{ lookup('env', 'RELATED_IMAGE_PROVIDER_GENERIC') }}"
 provider_nodejs_name: "nodejs"
-provider_nodejs_service_name: "{{ app_name }}-{{ provider_nodejs_name }}-{{ analyzer_component_name }}"
+provider_nodejs_service_name: "{{ app_name }}-{{ provider_nodejs_name }}-{{ provider_nodejs_component_name }}"
 
 provider_java_component_name: "extension"
 provider_java_container_limits_cpu: "1"
@@ -190,7 +190,7 @@ provider_java_container_requests_cpu: "1"
 provider_java_container_requests_memory: "2Gi"
 provider_java_image_fqin: "{{ lookup('env', 'RELATED_IMAGE_PROVIDER_JAVA') }}"
 provider_java_name: "java"
-provider_java_service_name: "{{ app_name }}-{{ provider_java_name }}-{{ analyzer_component_name }}"
+provider_java_service_name: "{{ app_name }}-{{ provider_java_name }}-{{ provider_java_component_name }}"
 
 language_discovery_fqin: "{{ lookup('env', 'RELATED_IMAGE_ADDON_DISCOVERY') }}"
 language_discovery_name: "language-discovery"