diff --git a/swh/templates/listers/keda-autoscaling.yaml b/swh/templates/listers/keda-autoscaling.yaml
index 86a5fef..07820da 100644
--- a/swh/templates/listers/keda-autoscaling.yaml
+++ b/swh/templates/listers/keda-autoscaling.yaml
@@ -1,64 +1,61 @@
 {{ if .Values.listers.enabled -}}
 {{- range $lister_type, $deployment_config := .Values.listers.deployments -}}
 {{ if get $deployment_config "autoScaling" }}
 {{- $autoscalingConfig := get $deployment_config "autoScaling" -}}
 {{- $lister_name := ( print "lister-" $lister_type ) -}}
 ---
 apiVersion: keda.sh/v1alpha1
 kind: TriggerAuthentication
 metadata:
   name: amqp-authentication-{{ $lister_name }}
   namespace: {{ $.Values.namespace }}
 spec:
-  secretTargetRef: # Optional.
-  - parameter: HTTP_HOST
+  secretTargetRef:
+  - parameter: host            # "host" is required by the scalerObject trigger metadata
     name: common-secrets
-    key: rabbitmq-http-host
+    key: rabbitmq-amqp-host
 
 ---
 apiVersion: keda.sh/v1alpha1
 kind: ScaledObject
 metadata:
   name: {{ $lister_name }}-operators
   namespace: {{ $.Values.namespace }}
 spec:
   scaleTargetRef:
     apiVersion:    apps/v1     # Optional. Default: apps/v1
     kind:          Deployment  # Optional. Default: Deployment
     # Mandatory. Must be in same namespace as ScaledObject
     name:          {{ $lister_name }}
     # envSourceContainerName: {container-name} # Optional. Default:
                                                # .spec.template.spec.containers[0]
   pollingInterval:  30                         # Optional. Default: 30 seconds
   cooldownPeriod:   3600                       # Optional. Default: 300 seconds
   idleReplicaCount: 0                          # Optional. Must be less than
                                                # minReplicaCount
   minReplicaCount:  {{ get $autoscalingConfig "minReplicaCount" | default 0 }}
   maxReplicaCount:  {{ get $autoscalingConfig "maxReplicaCount" | default 5 }}
   triggers:
     {{- range $queue := get $deployment_config "queues" }}
   - type: rabbitmq
     authenticationRef:
       name: amqp-authentication-{{ $lister_name }}
     metadata:
-      host: HTTP_HOST
-                                     # Optional. If not specified, it must be done
-                                     # by using TriggerAuthentication.
-      protocol: http                 # Optional. Specifies protocol to use,
+      protocol: auto                 # Optional. Specifies protocol to use,
                                      # either amqp or http, or auto to
                                      # autodetect based on the `host` value.
                                      # Default value is auto.
       mode: QueueLength              # QueueLength to trigger on number of msgs in queue
       excludeUnacknowledged: "false" # QueueLength should include unacked messages
                                      # Implies "http" protocol is used
       value: {{ get $autoscalingConfig "queueThreshold" | default 1 | quote }}
       queueName: {{ $queue }}
       vhostName: /                   # Optional. If not specified, use the vhost in the
                                      # `host` connection string. Alternatively, you can
                                      # use existing environment variables to read
                                      # configuration from: See details in "Parameter
                                      # list" section hostFromEnv: RABBITMQ_HOST%
     {{- end }}
 {{ end }}
 {{ end }}
 {{- end -}}
diff --git a/swh/templates/loaders/keda-autoscaling.yaml b/swh/templates/loaders/keda-autoscaling.yaml
index c617e3b..8460762 100644
--- a/swh/templates/loaders/keda-autoscaling.yaml
+++ b/swh/templates/loaders/keda-autoscaling.yaml
@@ -1,57 +1,57 @@
 {{ if .Values.loaders.enabled -}}
 {{- range $loader_type, $deployment_config := .Values.loaders.deployments -}}
 {{ if get $deployment_config "autoScaling" }}
 {{- $autoscalingConfig := get $deployment_config "autoScaling" -}}
 {{- $loader_name := ( print "loader-" $loader_type ) -}}
 ---
 apiVersion: keda.sh/v1alpha1
 kind: TriggerAuthentication
 metadata:
   name: amqp-authentication-{{ $loader_name }}
   namespace: {{ $.Values.namespace }}
 spec:
-  secretTargetRef: # Optional.
-  - parameter: host
+  secretTargetRef:
+  - parameter: host            # "host" is required by the scalerObject trigger metadata
     name: common-secrets
     key: rabbitmq-amqp-host
 
 ---
 apiVersion: keda.sh/v1alpha1
 kind: ScaledObject
 metadata:
   name: {{ $loader_name }}-operators
   namespace: {{ $.Values.namespace }}
 spec:
   scaleTargetRef:
     apiVersion:    apps/v1     # Optional. Default: apps/v1
     kind:          Deployment  # Optional. Default: Deployment
     # Mandatory. Must be in same namespace as ScaledObject
     name:          {{ $loader_name }}
     # envSourceContainerName: {container-name} # Optional. Default:
                                                # .spec.template.spec.containers[0]
   pollingInterval:  30                         # Optional. Default: 30 seconds
   cooldownPeriod:   300                        # Optional. Default: 300 seconds
   idleReplicaCount: 0                          # Optional. Must be less than
                                                # minReplicaCount
   minReplicaCount:  {{ get $autoscalingConfig "minReplicaCount" | default 0 }}
   maxReplicaCount:  {{ get $autoscalingConfig "maxReplicaCount" | default 5 }}
   triggers:
     {{- range $queue := get $deployment_config "queues" }}
   - type: rabbitmq
     authenticationRef:
       name: amqp-authentication-{{ $loader_name }}
     metadata:
       protocol: auto                 # Optional. Specifies protocol to use,
                                      # either amqp or http, or auto to
                                      # autodetect based on the `host` value.
                                      # Default value is auto.
       mode: QueueLength              # QueueLength to trigger on number of msgs in queue
       excludeUnacknowledged: "false" # QueueLength should include unacked messages
                                      # Implies "http" protocol is used
       value: {{ get $autoscalingConfig "queueThreshold" | default 10 | quote }}
       queueName: {{ $queue }}
       vhostName: /                   # Vhost to use for the connection
     {{- end }}
 {{ end }}
 {{ end }}
 {{- end -}}