diff --git a/magnumclient/v1/bays_shell.py b/magnumclient/v1/bays_shell.py
index 2b23509c..cea59563 100644
--- a/magnumclient/v1/bays_shell.py
+++ b/magnumclient/v1/bays_shell.py
@@ -246,13 +246,13 @@ def _config_bay_kubernetes(bay, baymodel, cfg_dir, force=False):
     cfg_file = "%s/config" % cfg_dir
     if baymodel.tls_disabled:
         cfg = ("apiVersion: v1\n"
-               "bays:\n"
-               "- bay:\n"
+               "clusters:\n"
+               "- cluster:\n"
                "    server: %(api_address)s\n"
                "  name: %(name)s\n"
                "contexts:\n"
                "- context:\n"
-               "    bay: %(name)s\n"
+               "    cluster: %(name)s\n"
                "    user: %(name)s\n"
                "  name: default/%(name)s\n"
                "current-context: default/%(name)s\n"
@@ -263,14 +263,14 @@ def _config_bay_kubernetes(bay, baymodel, cfg_dir, force=False):
                % {'name': bay.name, 'api_address': bay.api_address})
     else:
         cfg = ("apiVersion: v1\n"
-               "bays:\n"
-               "- bay:\n"
+               "clusters:\n"
+               "- cluster:\n"
                "    certificate-authority: ca.pem\n"
                "    server: %(api_address)s\n"
                "  name: %(name)s\n"
                "contexts:\n"
                "- context:\n"
-               "    bay: %(name)s\n"
+               "    cluster: %(name)s\n"
                "    user: %(name)s\n"
                "  name: default/%(name)s\n"
                "current-context: default/%(name)s\n"