diff --git a/tasks/glance_install.yml b/tasks/glance_install.yml
index 68cf22d4..7bcd566c 100644
--- a/tasks/glance_install.yml
+++ b/tasks/glance_install.yml
@@ -254,3 +254,22 @@
   notify:
     - Manage LB
     - Restart glance services
+
+- name: Ensure uWSGI directory exists
+  file:
+    path: "/etc/uwsgi/"
+    state: directory
+    mode: "0711"
+
+- name: Apply uWSGI configuration
+  config_template:
+    src: "glance-uwsgi.ini.j2"
+    dest: "/etc/uwsgi/{{ item.service_name }}.ini"
+    mode: "0744"
+    config_overrides: "{{ item.wsgi_overrides }}"
+    config_type: ini
+  with_items: "{{ filtered_glance_services }}"
+  when: item.wsgi_app | default(False)
+  notify:
+    - Manage LB
+    - Restart glance services
diff --git a/tasks/glance_uwsgi.yml b/tasks/glance_uwsgi.yml
deleted file mode 100644
index f443f91b..00000000
--- a/tasks/glance_uwsgi.yml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-# Copyright 2017, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: Ensure uWSGI directory exists
-  file:
-    path: "/etc/uwsgi/"
-    state: directory
-    mode: "0711"
-
-- name: Apply uWSGI configuration
-  config_template:
-    src: "glance-uwsgi.ini.j2"
-    dest: "/etc/uwsgi/{{ item.service_name }}.ini"
-    mode: "0744"
-    config_overrides: "{{ item.wsgi_overrides }}"
-    config_type: ini
-  with_items: "{{ filtered_glance_services }}"
-  when: item.wsgi_app | default(False)
-  notify:
-    - Manage LB
-    - Restart glance services
diff --git a/tasks/main.yml b/tasks/main.yml
index cc7a188e..57326729 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -40,10 +40,6 @@
   tags:
     - glance-config
 
-- include_tasks: glance_uwsgi.yml
-  tags:
-    - glance-config
-
 - include_tasks: glance_service_setup.yml
   when:
     - "glance_services['glance-api']['group'] in group_names"