diff --git a/Makefile b/Makefile
index 1d784c5659..e831b00c91 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ MANAGEMENT_COMMAND ?= awx-manage
 GCLOUD_AUTH ?=
 
 VERSION=$(shell git describe --long)
-VERSION3=$(shell git describe --long | sed 's/\-g.*//'
+VERSION3=$(shell git describe --long | sed 's/\-g.*//')
 VERSION3DOT=$(shell git describe --long | sed 's/\-g.*//' | sed 's/\-/\./')
 RELEASE_VERSION=$(shell git describe --long | sed 's@\([0-9.]\{1,\}\).*@\1@')
 
@@ -45,8 +45,10 @@ DATE := $(shell date -u +%Y%m%d%H%M)
 NAME ?= awx
 GIT_REMOTE_URL = $(shell git config --get remote.origin.url)
 ifeq ($(OFFICIAL),yes)
+    RELEASE ?= 1
     AW_REPO_URL ?= http://releases.ansible.com/ansible-tower
 else
+    RELEASE ?= 0.git$(shell git describe --long | cut -d - -f 2-2)
     AW_REPO_URL ?= http://jenkins.testing.ansible.com/ansible-tower_nightlies_f8b8c5588b2505970227a7b0900ef69040ad5a00/$(GIT_BRANCH)
 endif
 
@@ -55,8 +57,8 @@ ifeq ($(OFFICIAL),yes)
     SETUP_TAR_NAME=$(NAME)-setup-$(RELEASE_VERSION)
     SDIST_TAR_NAME=$(NAME)-$(RELEASE_VERSION)
 else
-    SETUP_TAR_NAME=$(NAME)-setup-$(VERSION3DOT)
-    SDIST_TAR_NAME=$(NAME)-$(VERSION3DOT)
+    SETUP_TAR_NAME=$(NAME)-setup-$(RELEASE_VERSION)-$(RELEASE)
+    SDIST_TAR_NAME=$(NAME)-$(RELEASE_VERSION)-$(RELEASE)
 endif
 
 SDIST_COMMAND ?= sdist
@@ -101,7 +103,7 @@ clean-dist:
 	rm -rf dist
 
 # Remove temporary build files, compiled Python files.
-clean: clean-rpm clean-deb clean-ui clean-tar clean-packer clean-bundle clean-dist
+clean: clean-ui clean-dist
 	rm -rf awx/public
 	rm -rf awx/lib/site-packages
 	rm -rf awx/job_status
diff --git a/setup.py b/setup.py
index bba7f1c602..cd11ba86a5 100755
--- a/setup.py
+++ b/setup.py
@@ -19,9 +19,13 @@ bindir = "/usr/bin"
 sharedir = "/usr/share/awx"
 docdir = "/usr/share/doc/ansible-tower"
 
+if os.getenv('OFFICIAL', 'no') == 'yes':
+    build_tag = ''
+else:
+    build_tag = '-' + '0.git' + subprocess.Popen("git describe --long | cut -d - -f 2-2", shell=True, stdout=subprocess.PIPE).stdout.read().strip()
 
 def get_version():
-    ver = subprocess.Popen("git describe --long", shell=True, stdout=subprocess.PIPE).stdout.read().strip()
+    ver = subprocess.Popen("git describe --long | cut -f1-1 -d -", shell=True, stdout=subprocess.PIPE).stdout.read().strip()
     return re.sub(r'-([0-9]+)-.*', r'.\1', ver)
 
 
@@ -57,6 +61,7 @@ class sdist_isolated(sdist):
 
     def __init__(self, dist):
         sdist.__init__(self, dist)
+        dist.metadata.version += build_tag
 
     def get_file_list(self):
         self.filelist.process_template_line('include setup.py')
@@ -162,6 +167,9 @@ setup(
         ("%s" % sosconfig, ["tools/sosreport/tower.py"])]),
     cmdclass = {'sdist_isolated': sdist_isolated},
     options = {
+        'egg_info': {
+            'tag_build': build_tag,
+        },
         'aliases': {
             'dev_build': 'clean --all egg_info sdist',
             'release_build': 'clean --all egg_info -b "" sdist',
diff --git a/tools/scripts/tower-python b/tools/scripts/tower-python
index d96abe967f..f45c27bb80 100755
--- a/tools/scripts/tower-python
+++ b/tools/scripts/tower-python
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # Enable Tower virtualenv
-if [ -f /var/lib/awx/venv/tower/bin/activate ]; then
-  . /var/lib/awx/venv/tower/bin/activate
+if [ -f /var/lib/awx/venv/awx/bin/activate ]; then
+  . /var/lib/awx/venv/awx/bin/activate
 fi
 
 # Run the requested Python command, using the interpreter from the path