diff --git a/defaults/main.yml b/defaults/main.yml
index cbb70f31..60eb9db4 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -234,12 +234,16 @@ glance_services:
     init_config_overrides: "{{ glance_api_init_overrides }}"
     start_order: 1
     wsgi_overrides: "{{ glance_api_uwsgi_ini_overrides }}"
-    wsgi_app: True
-    log_string: "--logto "
+    wsgi_app: "{{ not glance_enable_v1_api }}"
+    log_string: "{{ glance_enable_v1_api | ternary('--log-file=', '--logto ') }}"
     wsgi_name: glance-wsgi-api
     uwsgi_bind_address: "{{ glance_api_bind_address }}"
     uwsgi_port: "{{ glance_api_service_port }}"
-    program_override: "{{ glance_bin }}/uwsgi --ini /etc/uwsgi/glance-api.ini"
+    program_override: >-
+       {{ glance_enable_v1_api | ternary(
+          glance_bin ~ '/glance-api',
+          glance_bin ~ '/uwsgi --ini /etc/uwsgi/glance-api.ini')
+       }}
   glance-registry:
     group: glance_registry
     service_name: glance-registry
diff --git a/templates/glance-systemd-init.j2 b/templates/glance-systemd-init.j2
index 53050f25..63c9eabc 100644
--- a/templates/glance-systemd-init.j2
+++ b/templates/glance-systemd-init.j2
@@ -10,7 +10,7 @@ Type=simple
 User={{ glance_system_user_name }}
 Group={{ glance_system_group_name }}
 
-{% if program_override is defined %}
+{% if item.program_override is defined %}
 ExecStart={{ item.program_override }} {{ item.program_config_options | default('') }} {{ item.log_string | default('--log-file=') }}/var/log/glance/{{ item.service_name }}.log
 {% else %}
 ExecStart={{ glance_bin }}/{{ item.service_name }} {{ item.program_config_options | default('') }} --log-file=/var/log/glance/{{ item.service_name }}.log
diff --git a/templates/glance-uwsgi.ini.j2 b/templates/glance-uwsgi.ini.j2
index 610370e7..b842c292 100644
--- a/templates/glance-uwsgi.ini.j2
+++ b/templates/glance-uwsgi.ini.j2
@@ -17,3 +17,6 @@ add-header = Connection: close
 buffer-size = {{ glance_wsgi_buffer_size }}
 thunder-lock = true
 logfile-chmod = 644
+http-auto-chunked = true
+http-raw-body = true
+socket-timeout = 10
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index c97584ca..f92f74cb 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -16,8 +16,9 @@
 glance_distro_packages:
   - cronie
   - cronie-anacron
+  - git
+  - libxml2-devel
+  - nfs-utils
   - rpcbind
   - rsync
-  - git
-  - nfs-utils
   - which
diff --git a/vars/suse-42.yml b/vars/suse-42.yml
index 8c85a090..51e200b9 100644
--- a/vars/suse-42.yml
+++ b/vars/suse-42.yml
@@ -17,8 +17,9 @@
 glance_distro_packages:
   - cronie
   - cronie-anacron
+  - git-core
+  - libxml2-devel
+  - nfs-utils
   - rpcbind
   - rsync
-  - git-core
-  - nfs-utils
   - which
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index d7528f9d..976b59ae 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -18,7 +18,8 @@ cache_timeout: 600
 
 # Common apt packages
 glance_distro_packages:
+  - git
+  - libxml2-dev
+  - nfs-common
   - rpcbind
   - rsync
-  - git
-  - nfs-common