diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index f99eecdfe..81907cc24 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -261,30 +261,44 @@ prompt_kubernetes_icon() {
 #KUBERNETES context:
 # - display current KUBERNETES context for connection
 # - from file .kube/config or env $KUBECONFIG
-# - displays context name
-# - displays namespace if set
+# - displays kubernetes icon if $OMZ_THEME_AGNOSTER_KUBERNETES_ICON is not set to hidden
+# - displays context name if $OMZ_THEME_AGNOSTER_KUBERNETES_CONTEXT is not set to hidden
+# - displays namespace if $OMZ_THEME_AGNOSTER_KUBERNETES_NAMESPACE is not set to hidden
 prompt_kubernetes() {
   KUBERNETES_BINARY="${KUBERNETES_BINARY:-kubectl}"
   [[ -z "$KUBECONFIG" && -z "$(${KUBERNETES_BINARY} config current-context 2>/dev/null)" ]] && return
 
-  KUBERNETES_CONTEXT="$(${KUBERNETES_BINARY} config current-context 2>/dev/null)"
-  KUBERNETES_CONTEXT="${KUBERNETES_CONTEXT:-N/A}"
-  KUBERNETES_NAMESPACE="$(${KUBERNETES_BINARY} config view --minify -o jsonpath={..namespace} 2>/dev/null)"
-  KUBERNETES_NAMESPACE="${KUBERNETES_NAMESPACE:+ ns:$KUBERNETES_NAMESPACE}"
+  KUBERNETES_PROMPT=""
 
-  prompt_kubernetes_icon "$KUBERNETES_CONTEXT"
-  prompt_segment $CURRENT_BG default "$KUBERNETES_CONTEXT$KUBERNETES_NAMESPACE"
+  if [[ "$OMZ_THEME_AGNOSTER_KUBERNETES_CONTEXT" != "hidden" ]]; then
+    KUBERNETES_CONTEXT="$(${KUBERNETES_BINARY} config current-context 2>/dev/null)"
+    KUBERNETES_CONTEXT="${KUBERNETES_CONTEXT:-N/A}"
+    KUBERNETES_PROMPT="$KUBERNETES_PROMPT$KUBERNETES_CONTEXT"
+  fi
+
+  if [[ "$OMZ_THEME_AGNOSTER_KUBERNETES_NAMESPACE" != "hidden" ]]; then
+    KUBERNETES_NAMESPACE="$(${KUBERNETES_BINARY} config view --minify -o jsonpath={..namespace} 2>/dev/null)"
+    KUBERNETES_NAMESPACE="${KUBERNETES_NAMESPACE:+ ns:$KUBERNETES_NAMESPACE}"
+    KUBERNETES_PROMPT="$KUBERNETES_PROMPT -$KUBERNETES_NAMESPACE"
+  fi
+
+  if [[ "$KUBERNETES_PROMPT" != "" ]]; then
+    if [[ "$OMZ_THEME_AGNOSTER_KUBERNETES_ICON" != "hidden" ]]; then
+      prompt_kubernetes_icon "$KUBERNETES_CONTEXT"
+    fi
+    prompt_segment $CURRENT_BG default "$KUBERNETES_PROMPT"
+  fi
 }
 
 ## Main prompt
 build_prompt() {
   RETVAL=$?
   prompt_status
-  prompt_kubernetes
   prompt_virtualenv
   prompt_aws
   prompt_context
   prompt_dir
+  prompt_kubernetes
   prompt_git
   prompt_bzr
   prompt_hg