diff --git a/doc/source/conf.py b/doc/source/conf.py
index 6d001b9..3c8c328 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -231,7 +231,7 @@ latex_elements = {
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     (master_doc, 'doc-' + target_name + '.tex',
-     title.replace("_", "\_"), author, 'manual'),
+     title.replace("_", r"\_"), author, 'manual'),
 ]
 
 latex_use_xindy = False
diff --git a/tasks/magnum_db_sync.yml b/tasks/magnum_db_sync.yml
index 811a07e..8aa0640 100644
--- a/tasks/magnum_db_sync.yml
+++ b/tasks/magnum_db_sync.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 - name: Perform a synchronization of the Magnum database
-  command: "{{ magnum_bin}}/magnum-db-manage upgrade"
+  command: "{{ magnum_bin }}/magnum-db-manage upgrade"
   become: yes
   become_user: "{{ magnum_system_user_name }}"
   changed_when: false
diff --git a/templates/magnum.conf.j2 b/templates/magnum.conf.j2
index f6c92c3..40f87d3 100644
--- a/templates/magnum.conf.j2
+++ b/templates/magnum.conf.j2
@@ -34,30 +34,17 @@ region_name = {{ magnum_heat_service_region }}
 endpoint_type = internalURL
 
 [keystone_auth]
-auth_uri = {{ keystone_service_publicurl }}
-www_authenticate_uri = {{ keystone_service_publicurl }}
-auth_version = v3
-insecure = {{ keystone_service_internaluri_insecure | bool }}
-memcached_servers = {{ magnum_memcached_servers }}
-token_cache_time = 300
-auth_type = {{ magnum_keystone_auth_plugin }}
-auth_url = {{ keystone_service_internaluri }}
-project_domain_name = {{ magnum_service_project_domain_name }}
-user_domain_name = {{ magnum_service_user_domain_name }}
-project_name = {{ magnum_service_project_name }}
-username = {{ magnum_service_user_name }}
-password = {{ magnum_service_password }}
+auth_section = keystone_authtoken
 
 [keystone_authtoken]
 region_name = {{ magnum_keystone_service_region }}
-auth_uri = {{ keystone_service_publicurl }}
-www_authenticate_uri = {{ keystone_service_publicurl }}
+www_authenticate_uri = {{ keystone_service_internaluri }}
 auth_version = v3
 insecure = {{ keystone_service_internaluri_insecure | bool }}
 memcached_servers = {{ magnum_memcached_servers }}
 token_cache_time = 300
 auth_type = {{ magnum_keystone_auth_plugin }}
-auth_url = {{ keystone_service_internaluri }}
+auth_url = {{ keystone_service_internalurl }}
 project_domain_name = {{ magnum_service_project_domain_name }}
 user_domain_name = {{ magnum_service_user_domain_name }}
 project_name = {{ magnum_service_project_name }}