diff --git a/templates/horizon-manage.py.j2 b/templates/horizon-manage.py.j2
index b0fd422b..1ad1ccb8 100644
--- a/templates/horizon-manage.py.j2
+++ b/templates/horizon-manage.py.j2
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!{{ horizon_venv_enabled | bool | ternary(horizon_venv_bin + "/", "/usr/bin/env ") }}python
 
 # 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
@@ -13,14 +13,6 @@
 # under the License.
 
 import os
-
-{% if horizon_venv_enabled | bool %}
-
-activate_this = os.path.expanduser("{{ horizon_venv_bin }}/activate_this.py")
-execfile(activate_this, dict(__file__=activate_this))
-
-{% endif %}
-
 import sys
 
 from django.core.management import execute_from_command_line  # noqa
diff --git a/templates/horizon_django.wsgi.j2 b/templates/horizon_django.wsgi.j2
index 60edb1e5..1be0e06f 100644
--- a/templates/horizon_django.wsgi.j2
+++ b/templates/horizon_django.wsgi.j2
@@ -1,13 +1,5 @@
 import logging
 import os
-
-{% if horizon_venv_enabled | bool %}
-
-activate_this = os.path.expanduser("{{ horizon_venv_bin }}/activate_this.py")
-execfile(activate_this, dict(__file__=activate_this))
-
-{% endif %}
-
 import sys
 from django.core.wsgi import get_wsgi_application
 from django.conf import settings
@@ -19,4 +11,4 @@ sys.stdout = sys.stderr
 
 DEBUG = False
 
-application = get_wsgi_application()
\ No newline at end of file
+application = get_wsgi_application()
diff --git a/templates/openstack_dashboard.conf.j2 b/templates/openstack_dashboard.conf.j2
index 7a96996f..3efd7d4f 100644
--- a/templates/openstack_dashboard.conf.j2
+++ b/templates/openstack_dashboard.conf.j2
@@ -36,7 +36,8 @@
 {% endif %}
 
     WSGIScriptAlias / {{ horizon_lib_wsgi_file }}
-    WSGIDaemonProcess horizon user={{ horizon_system_user_name }} group={{ horizon_system_group_name }} processes={{ horizon_wsgi_processes | default(wsgi_threads) }} threads={{ horizon_wsgi_threads | default(wsgi_threads) }}
+    WSGIDaemonProcess horizon user={{ horizon_system_user_name }} group={{ horizon_system_group_name }} processes={{ horizon_wsgi_processes | default(wsgi_threads) }} threads={{ horizon_wsgi_threads | default(wsgi_threads) }} {% if horizon_venv_enabled | bool %}python-path={{ horizon_venv_bin | dirname }}/lib/python2.7/site-packages{% endif %}
+
     WSGIProcessGroup horizon
     WSGIApplicationGroup horizon