diff --git a/templates/queens/proxy-server.conf b/templates/queens/proxy-server.conf
index a16b607..4cab807 100644
--- a/templates/queens/proxy-server.conf
+++ b/templates/queens/proxy-server.conf
@@ -24,9 +24,9 @@ key_file = {{ ssl_key }}
 {% if auth_type == 'keystone' %}
 [pipeline:main]
 {% if transport_url %}
-pipeline = ceilometer catch_errors gatekeeper healthcheck proxy-logging cache container_sync bulk tempurl ratelimit formpost authtoken keystoneauth swift3 s3token staticweb copy container-quotas account-quotas slo dlo versioned_writes symlink proxy-logging proxy-server
+pipeline = ceilometer catch_errors gatekeeper healthcheck proxy-logging cache container_sync bulk tempurl ratelimit formpost authtoken swift3 s3token keystoneauth staticweb copy container-quotas account-quotas slo dlo versioned_writes symlink proxy-logging proxy-server
 {% else %}
-pipeline = catch_errors gatekeeper healthcheck proxy-logging cache container_sync bulk tempurl ratelimit formpost authtoken keystoneauth swift3 s3token staticweb copy container-quotas account-quotas slo dlo versioned_writes symlink proxy-logging proxy-server
+pipeline = catch_errors gatekeeper healthcheck proxy-logging cache container_sync bulk tempurl ratelimit formpost authtoken swift3 s3token keystoneauth staticweb copy container-quotas account-quotas slo dlo versioned_writes symlink proxy-logging proxy-server
 {% endif %}
 {% else %}
 [pipeline:main]
diff --git a/templates/rocky/proxy-server.conf b/templates/rocky/proxy-server.conf
index 55ae2c9..eef82f0 100644
--- a/templates/rocky/proxy-server.conf
+++ b/templates/rocky/proxy-server.conf
@@ -24,9 +24,9 @@ key_file = {{ ssl_key }}
 {% if auth_type == 'keystone' %}
 [pipeline:main]
 {% if transport_url %}
-pipeline = ceilometer catch_errors gatekeeper healthcheck proxy-logging cache container_sync bulk tempurl ratelimit formpost authtoken keystoneauth s3api s3token staticweb copy container-quotas account-quotas slo dlo versioned_writes symlink proxy-logging proxy-server
+pipeline = ceilometer catch_errors gatekeeper healthcheck proxy-logging cache container_sync bulk tempurl ratelimit formpost authtoken s3api s3token keystoneauth staticweb copy container-quotas account-quotas slo dlo versioned_writes symlink proxy-logging proxy-server
 {% else %}
-pipeline = catch_errors gatekeeper healthcheck proxy-logging cache container_sync bulk tempurl ratelimit formpost authtoken keystoneauth s3api s3token staticweb copy container-quotas account-quotas slo dlo versioned_writes symlink proxy-logging proxy-server
+pipeline = catch_errors gatekeeper healthcheck proxy-logging cache container_sync bulk tempurl ratelimit formpost authtoken s3api s3token keystoneauth staticweb copy container-quotas account-quotas slo dlo versioned_writes symlink proxy-logging proxy-server
 {% endif %}
 {% else %}
 [pipeline:main]