diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index c692c2e..c2329f8 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -9,6 +9,8 @@ configs:
     server_port:
       cont: 9696
       ingress: network
+    username: neutron
+    password: password
     core_plugin: "ml2"
     ml2:
       tenant_network_types:
diff --git a/service/files/neutron.conf.j2 b/service/files/neutron.conf.j2
index bcea232..768c369 100644
--- a/service/files/neutron.conf.j2
+++ b/service/files/neutron.conf.j2
@@ -61,16 +61,7 @@ max_retries = -1
 max_pool_size = {{ neutron.db.max_pool_size }}
 max_overflow = {{ neutron.db.max_overflow }}
 
-[keystone_authtoken]
-auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}
-auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}
-auth_type = password
-project_domain_id = default
-user_domain_id = default
-project_name = service
-username = {{ neutron.db.username }}
-password = {{ neutron.db.password }}
-memcached_servers = {{ address('memcached', memcached.port) }}
+{{ keystone_authtoken.keystone_authtoken(neutron.username, neutron.password) }}
 
 {% if searchlight is defined and (searchlight.services.neutron or searchlight.services.nova) %}
 [oslo_messaging_notifications]
diff --git a/service/neutron-server.yaml b/service/neutron-server.yaml
index d3a37eb..c48b68f 100644
--- a/service/neutron-server.yaml
+++ b/service/neutron-server.yaml
@@ -28,14 +28,14 @@ service:
             - ml2-conf.ini
         - name: neutron-user-create
           dependencies:
-            - keystone-create-project
+            - keystone-create-domain
           type: single
-          command: openstack user create --project service --password {{ neutron.db.password }} {{ neutron.db.username }}
+          command: openstack user create --domain {{ service_account.domain }} --password {{ neutron.password }} {{ neutron.username }}
         - name: neutron-role-add
           dependencies:
             - neutron-user-create
           type: single
-          command: openstack role add --project service --user {{ neutron.db.username }} admin
+          command: openstack role add --domain {{ service_account.domain }} --user {{ neutron.username }} admin
         - name: neutron-service-create
           dependencies:
             - keystone