diff --git a/.travis.yml b/.travis.yml
index f271e99f..c2bb976a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,5 +53,7 @@ jobs:
 stages:
 - lint
 - test
-- deploy
-- test-deploy
+- name: deploy
+  if: (tag is present) and (type = push)
+- name: test-deploy
+  if: (tag is present) and (type = push)
diff --git a/openshift/__init__.py b/openshift/__init__.py
index 35201ec3..026f7f50 100644
--- a/openshift/__init__.py
+++ b/openshift/__init__.py
@@ -18,5 +18,5 @@
 
 # Do not edit these constants. They will be updated automatically
 # by scripts/update-client.sh.
-__version__ = "0.6.2"
+__version__ = "0.6.3"
 __k8s_client_version__ = "6.0.0"
diff --git a/python-openshift.spec b/python-openshift.spec
index c51ae0d1..056610f0 100644
--- a/python-openshift.spec
+++ b/python-openshift.spec
@@ -3,7 +3,7 @@
 %global library openshift
 
 Name:       python-%{library}
-Version:    0.6.2
+Version:    0.6.3
 Release:    10%{?dist}
 Summary:    Python client for the OpenShift API  
 License:    MIT
diff --git a/requirements.txt b/requirements.txt
index f5e723ad..8d2b3fa6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 dictdiffer
 jinja2
-kubernetes >= 6.0.0
+kubernetes == 6.0.0
 python-string-utils
 ruamel.yaml >= 0.15
 six
diff --git a/scripts/constants.py b/scripts/constants.py
index d8ad8086..cd17b2c0 100644
--- a/scripts/constants.py
+++ b/scripts/constants.py
@@ -23,7 +23,7 @@
 
 # client version for packaging and releasing. It can
 # be different than SPEC_VERSION.
-CLIENT_VERSION = "0.6.2"
+CLIENT_VERSION = "0.6.3"
 KUBERNETES_CLIENT_VERSION = "6.0.0"
 
 # Name of the release package
diff --git a/scripts/update-version.sh b/scripts/update-version.sh
index 0261454c..bf85429b 100755
--- a/scripts/update-version.sh
+++ b/scripts/update-version.sh
@@ -1,5 +1,6 @@
 set -x
 SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")
+PACKAGE_NAME=$(python "${SCRIPT_ROOT}/constants.py" PACKAGE_NAME)
 SOURCE_ROOT="${SCRIPT_ROOT}/../"
 CLIENT_ROOT="${SOURCE_ROOT}/${PACKAGE_NAME}"
 CLIENT_VERSION=$(python "${SCRIPT_ROOT}/constants.py" CLIENT_VERSION)
diff --git a/setup.py b/setup.py
index 1fd53256..afd38de6 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@
 
 # Do not edit these constants. They will be updated automatically
 # by scripts/update-client.sh.
-CLIENT_VERSION = "0.6.2"
+CLIENT_VERSION = "0.6.3"
 PACKAGE_NAME = "openshift"
 DEVELOPMENT_STATUS = "3 - Alpha"