diff --git a/external/keystone_user.py b/external/keystone_user.py
index 9290847..1245eec 100644
--- a/external/keystone_user.py
+++ b/external/keystone_user.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Based on Jimmy Tang's implementation
diff --git a/planetstack/core/tests.py b/planetstack/core/tests.py
index d07069a..a02497e 100644
--- a/planetstack/core/tests.py
+++ b/planetstack/core/tests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 from django.test import TestCase
 from core.models import *
 from rest_framework.test import *
diff --git a/planetstack/dependency_walker.py b/planetstack/dependency_walker.py
index 6120d7d..46fe655 100644
--- a/planetstack/dependency_walker.py
+++ b/planetstack/dependency_walker.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 import os
 import imp
diff --git a/planetstack/ec2_observer/toposort.py b/planetstack/ec2_observer/toposort.py
index e771325..16469b4 100644
--- a/planetstack/ec2_observer/toposort.py
+++ b/planetstack/ec2_observer/toposort.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 import time
 import traceback
diff --git a/planetstack/openstack_observer/ansible.py b/planetstack/openstack_observer/ansible.py
index e5ce780..0459cb9 100644
--- a/planetstack/openstack_observer/ansible.py
+++ b/planetstack/openstack_observer/ansible.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 import jinja2
 import tempfile
 import os
diff --git a/planetstack/openstack_observer/ceilometer.py b/planetstack/openstack_observer/ceilometer.py
index e34b000..9944a9c 100644
--- a/planetstack/openstack_observer/ceilometer.py
+++ b/planetstack/openstack_observer/ceilometer.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from ceilometerclient import client
diff --git a/planetstack/openstack_observer/toposort.py b/planetstack/openstack_observer/toposort.py
index ad1797e..5170f20 100644
--- a/planetstack/openstack_observer/toposort.py
+++ b/planetstack/openstack_observer/toposort.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 import time
 import traceback
diff --git a/planetstack/planetstack/config.py b/planetstack/planetstack/config.py
index cb2e33f..e8b8dbc 100644
--- a/planetstack/planetstack/config.py
+++ b/planetstack/planetstack/config.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 import sys
 import os
 import time
diff --git a/planetstack/rr_observer/rrlib_config.py b/planetstack/rr_observer/rrlib_config.py
index 6d785e7..d0c00c2 100644
--- a/planetstack/rr_observer/rrlib_config.py
+++ b/planetstack/rr_observer/rrlib_config.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 DNSREDIR_CONFIGDIR_PREFIX = "/etc/dnsredir/"
 DNSREDIR_LOGDIR_PREFIX = "/var/log/dnsredir/"
diff --git a/planetstack/rr_observer/steps/sync_servicemap.py b/planetstack/rr_observer/steps/sync_servicemap.py
index 6ab8c79..f276bc4 100644
--- a/planetstack/rr_observer/steps/sync_servicemap.py
+++ b/planetstack/rr_observer/steps/sync_servicemap.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 import os
 import sys
diff --git a/planetstack/syndicate_observer/steps/sync_volume.py b/planetstack/syndicate_observer/steps/sync_volume.py
index 7ee395c..20060ca 100644
--- a/planetstack/syndicate_observer/steps/sync_volume.py
+++ b/planetstack/syndicate_observer/steps/sync_volume.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 import os
 import sys
diff --git a/planetstack/syndicate_observer/steps/sync_volumeaccessright.py b/planetstack/syndicate_observer/steps/sync_volumeaccessright.py
index e3700fd..c1fef1c 100644
--- a/planetstack/syndicate_observer/steps/sync_volumeaccessright.py
+++ b/planetstack/syndicate_observer/steps/sync_volumeaccessright.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 import os
 import sys
diff --git a/planetstack/syndicate_observer/steps/sync_volumeslice.py b/planetstack/syndicate_observer/steps/sync_volumeslice.py
index 0fc6d4d..63b5e53 100644
--- a/planetstack/syndicate_observer/steps/sync_volumeslice.py
+++ b/planetstack/syndicate_observer/steps/sync_volumeslice.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 import os
 import sys
diff --git a/planetstack/syndicate_observer/syndicatelib.py b/planetstack/syndicate_observer/syndicatelib.py
index 6be7738..09953cb 100644
--- a/planetstack/syndicate_observer/syndicatelib.py
+++ b/planetstack/syndicate_observer/syndicatelib.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 Define some common methods for the Syndicate observer.
diff --git a/planetstack/syndicate_observer/syndicatelib_config/config-jude.py b/planetstack/syndicate_observer/syndicatelib_config/config-jude.py
index 0fbea5d..81e7478 100644
--- a/planetstack/syndicate_observer/syndicatelib_config/config-jude.py
+++ b/planetstack/syndicate_observer/syndicatelib_config/config-jude.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # configuration for syndicatelib
 SYNDICATE_SMI_URL="http://localhost:8080"
diff --git a/planetstack/syndicate_observer/syndicatelib_config/config-opencloud.py b/planetstack/syndicate_observer/syndicatelib_config/config-opencloud.py
index 4fb7fcc..463b84e 100644
--- a/planetstack/syndicate_observer/syndicatelib_config/config-opencloud.py
+++ b/planetstack/syndicate_observer/syndicatelib_config/config-opencloud.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # ---------------------------------
 # This is the configuration file used by the Syndicate observer.
diff --git a/planetstack/syndicate_observer/syndicatelib_config/config.py b/planetstack/syndicate_observer/syndicatelib_config/config.py
index 4fb7fcc..463b84e 100644
--- a/planetstack/syndicate_observer/syndicatelib_config/config.py
+++ b/planetstack/syndicate_observer/syndicatelib_config/config.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # ---------------------------------
 # This is the configuration file used by the Syndicate observer.
diff --git a/planetstack/tools/copy-opencloud.py b/planetstack/tools/copy-opencloud.py
index 205ea2d..d71ebad 100644
--- a/planetstack/tools/copy-opencloud.py
+++ b/planetstack/tools/copy-opencloud.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 
 import base64
 import os
diff --git a/planetstack/tools/diff-opencloud.py b/planetstack/tools/diff-opencloud.py
index 819fa45..4b6511c 100644
--- a/planetstack/tools/diff-opencloud.py
+++ b/planetstack/tools/diff-opencloud.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 
 import base64
 import os
diff --git a/planetstack/tools/get_instance_ip.py b/planetstack/tools/get_instance_ip.py
index 0d26126..79b6dd6 100644
--- a/planetstack/tools/get_instance_ip.py
+++ b/planetstack/tools/get_instance_ip.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 
 import json
 import os
diff --git a/planetstack/tools/get_instance_name.py b/planetstack/tools/get_instance_name.py
index 5dc5ca3..3450df5 100644
--- a/planetstack/tools/get_instance_name.py
+++ b/planetstack/tools/get_instance_name.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 
 import json
 import os
diff --git a/planetstack/tools/openstack-healthcheck.py b/planetstack/tools/openstack-healthcheck.py
index 63534c8..4b8a3f1 100644
--- a/planetstack/tools/openstack-healthcheck.py
+++ b/planetstack/tools/openstack-healthcheck.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 
 """
     Check the status of libvirt, openstack-nova-compute, and
diff --git a/planetstack/util/logger.py b/planetstack/util/logger.py
index a5b2a46..e4137e7 100644
--- a/planetstack/util/logger.py
+++ b/planetstack/util/logger.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 #----------------------------------------------------------------------
 # Copyright (c) 2008 Board of Trustees, Princeton University
diff --git a/planetstack/util/xml.py b/planetstack/util/xml.py
index 7b6c72a..d3aefb1 100644
--- a/planetstack/util/xml.py
+++ b/planetstack/util/xml.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 from types import StringTypes
 from lxml import etree
 from StringIO import StringIO
diff --git a/planetstack/xos-config.py b/planetstack/xos-config.py
index 7aa375b..e6f3d60 100755
--- a/planetstack/xos-config.py
+++ b/planetstack/xos-config.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 import sys
 from planetstack.config import Config