diff --git a/meta/main.yml b/meta/main.yml
index 1314387..b8c8705 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -20,6 +20,6 @@ dependencies:
     nsbase_app_root_path: "{{ app_root_path }}"
     nsbase_app_nginx_hostname: "{{ app_nginx_hostname }}"
     nsbase_app_service_name: "{{ uwsgi_app_service_name }}"
-    nsbase_app_service_command: "{{ uwsgi_venv }}/bin/uwsgi --ini {{ uwsgi_config_path }}/{{ uwsgi_app_ini }}"
+    nsbase_app_service_command: "{{ uwsgi_supervisor_app_command }}"
     nsbase_app_service_stop_signal: QUIT
-    nsbase_nginx_app_config: "{{ app_name }}_uwsgi_nginx.conf"
+    nsbase_nginx_app_config: "{{ uwsgi_nginx_app_config }}"
diff --git a/vars/main.yml b/vars/main.yml
index 3f7eb46..403faca 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -7,8 +7,13 @@ web_user: "{{ ansible_env.SUDO_USER }}"
 # NGINX
 nginx_app_config: "{{ app_name }}_uwsgi_nginx.conf"
 
+
 # UWSGI
 uwsgi_venv: "{{ virtualenv_root_path }}/uwsgi"
 uwsgi_config_path: "{{ web_root_path }}/config/uwsgi"
 uwsgi_app_ini: "{{ app_name }}_uwsgi.ini"
 uwsgi_app_service_name: "{{ app_name }}_uwsgi"
+
+# TODO: Document extracted variables
+uwsgi_supervisor_app_command: "{{ uwsgi_venv }}/bin/uwsgi --ini {{ uwsgi_config_path }}/{{ uwsgi_app_ini }}"
+uwsgi_nginx_app_config: "{{ app_name }}_uwsgi_nginx.conf"