diff --git a/ci/autoscaler/pipeline.yml b/ci/autoscaler/pipeline.yml
index 6db24a015b..d93fc3973b 100644
--- a/ci/autoscaler/pipeline.yml
+++ b/ci/autoscaler/pipeline.yml
@@ -21,7 +21,7 @@ anchors:
       operations/loggregator-certs-from-cf.yml
       operations/add-extra-plan.yml
       operations/set-release-version.yml
-      operations/use-log-cache.yml
+      operations/configure-log-cache-and-forward-metrics-via-mtls.yml
       operations/enable-metricsforwarder-via-metron-agent.yml
       operations/remove-metricsserver.yml
       operations/remove-metricsgateway.yml
@@ -36,7 +36,7 @@ anchors:
       operations/loggregator-certs-from-cf.yml
       operations/add-extra-plan.yml
       operations/set-release-version.yml
-      operations/use-log-cache.yml
+      operations/configure-log-cache-and-forward-metrics-via-mtls.yml
       operations/enable-metricsforwarder-via-syslog-agent.yml
       operations/remove-metricsserver.yml
       operations/remove-metricsgateway.yml
diff --git a/ci/autoscaler/scripts/deploy-autoscaler.sh b/ci/autoscaler/scripts/deploy-autoscaler.sh
index 1b3dce6ee9..d8e0351339 100755
--- a/ci/autoscaler/scripts/deploy-autoscaler.sh
+++ b/ci/autoscaler/scripts/deploy-autoscaler.sh
@@ -16,7 +16,7 @@ ops_files=${OPS_FILES:-"${autoscaler_dir}/operations/add-releases.yml\
   ${autoscaler_dir}/operations/loggregator-certs-from-cf.yml\
   ${autoscaler_dir}/operations/add-extra-plan.yml\
   ${autoscaler_dir}/operations/set-release-version.yml\
-  ${autoscaler_dir}/operations/use-log-cache.yml\
+  ${autoscaler_dir}/operations/configure-log-cache-and-forward-metrics-via-mtls.yml\
   ${autoscaler_dir}/operations/remove-metricsserver.yml\
   ${autoscaler_dir}/operations/remove-metricsgateway.yml\
   ${autoscaler_dir}/operations/enable-log-cache-via-uaa.yml\
diff --git a/operations/use-log-cache.yml b/operations/configure-log-cache-and-forward-metrics-via-mtls.yml
similarity index 98%
rename from operations/use-log-cache.yml
rename to operations/configure-log-cache-and-forward-metrics-via-mtls.yml
index 927f12cd1b..3316b0a527 100644
--- a/operations/use-log-cache.yml
+++ b/operations/configure-log-cache-and-forward-metrics-via-mtls.yml
@@ -1,6 +1,8 @@
+# safeguard: make sure there is no loggregator agent configured
 - type: remove
   path: /instance_groups/name=metricsforwarder/jobs/name=loggregator_agent?
 
+
 # configure metricscollector
 - type: replace
   path: /instance_groups/name=eventgenerator/jobs/name=eventgenerator/properties/autoscaler/eventgenerator/metricscollector/use_log_cache?
diff --git a/operations/enable-metricsforwarder-via-metron-agent.yml b/operations/enable-metricsforwarder-via-metron-agent.yml
index 3be64c9ddd..96811277f5 100644
--- a/operations/enable-metricsforwarder-via-metron-agent.yml
+++ b/operations/enable-metricsforwarder-via-metron-agent.yml
@@ -1,4 +1,3 @@
-# configure metricsforwarder
 - type: replace
   path: /instance_groups/name=metricsforwarder/jobs/name=metricsforwarder/properties/autoscaler/metricsforwarder/loggregator
   value: