diff --git a/stack.sh b/stack.sh
index dfc9d24..396d742 100755
--- a/stack.sh
+++ b/stack.sh
@@ -60,6 +60,9 @@
 LC_ALL=en_US.utf8
 export LC_ALL
 
+# Clear all OpenStack related envvars
+unset `env | grep -E '^OS_' | cut -d = -f 1`
+
 # Make sure umask is sane
 umask 022