diff --git a/puppet/services/manila-scheduler.yaml b/puppet/services/manila-scheduler.yaml
index 7d43f685ed..364a1a3de3 100644
--- a/puppet/services/manila-scheduler.yaml
+++ b/puppet/services/manila-scheduler.yaml
@@ -70,7 +70,7 @@ outputs:
             manila::compute::nova::nova_admin_password: {get_param: NovaPassword}
             manila::compute::nova::nova_admin_tenant_name: 'service'
             manila::network::neutron::neutron_url: {get_param: [EndpointMap, NeutronInternal, uri]}
-            manila::network::neutron::neutron_admin_auth_url: {get_param: [EndpointMap, NeutronAdmin, uri]}
+            manila::network::neutron::neutron_admin_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
             manila::network::neutron::neutron_admin_password: {get_param: NeutronPassword}
       step_config: |
         include ::tripleo::profile::base::manila::scheduler
diff --git a/releasenotes/notes/fix-neutron_admin_auth_url-c88224251d8eb807.yaml b/releasenotes/notes/fix-neutron_admin_auth_url-c88224251d8eb807.yaml
new file mode 100644
index 0000000000..fa4074b1f7
--- /dev/null
+++ b/releasenotes/notes/fix-neutron_admin_auth_url-c88224251d8eb807.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - The "neutron_admin_auth_url" is now properly set using KeystoneInternal
+    rather than using the NeutronAdmin endpoint.