diff --git a/devstack/local.conf.worker.overcloud.sample b/devstack/local.conf.worker.overcloud.sample
new file mode 100644
index 000000000..7dce042a5
--- /dev/null
+++ b/devstack/local.conf.worker.overcloud.sample
@@ -0,0 +1,64 @@
+[[local|localrc]]
+
+enable_plugin kuryr-kubernetes \
+    https://git.openstack.org/openstack/kuryr-kubernetes
+
+RECLONE="no"
+
+# Log settings for better readability
+LOGFILE=devstack.log
+LOG_COLOR=False
+
+
+# Credentials
+ADMIN_PASSWORD=pass
+DATABASE_PASSWORD=pass
+RABBIT_PASSWORD=pass
+SERVICE_PASSWORD=pass
+SERVICE_TOKEN=pass
+# Enable Keystone v3
+IDENTITY_API_VERSION=3
+
+# In pro of speed and being lightweight, we will be explicit in regards to
+# which services we enable
+ENABLED_SERVICES=""
+
+SERVICE_HOST=UNDERCLOUD_CONTROLLER_IP
+MULTI_HOST=1
+KEYSTONE_SERVICE_HOST=$SERVICE_HOST
+MYSQL_HOST=$SERVICE_HOST
+RABBIT_HOST=$SERVICE_HOST
+
+# Docker
+# ======
+# If you already have docker configured, running and with its socket writable
+# by the stack user, you can omit the following line.
+enable_plugin devstack-plugin-container https://git.openstack.org/openstack/devstack-plugin-container
+
+
+# Kubernetes
+# ==========
+#
+
+# We use hyperkube to run the services. You can select the hyperkube image and/
+# or version by uncommenting and setting the following ENV vars different
+# to the following defaults:
+# KURYR_HYPERKUBE_IMAGE="gcr.io/google_containers/hyperkube-amd64"
+# KURYR_HYPERKUBE_VERSION="v1.6.2"
+#
+# We are reusing an existing deployment on master, you should uncomment and
+# set an ENV var so that the Kubelet devstack runs can find the API server:
+# KURYR_K8S_API_URL="http (or https, if K8S is SSL/TLS enabled)://k8s_api_ip:k8s_api_port"
+
+# Kubelet
+# =======
+#
+# Kubelet should almost invariably be run by devstack
+enable_service kubelet
+
+# You can specify a different location for the hyperkube binary that will be
+# extracted from the hyperkube container into the Host filesystem:
+# KURYR_HYPERKUBE_BINARY=/usr/local/bin/hyperkube
+#
+# NOTE: KURYR_HYPERKUBE_IMAGE, KURYR_HYPERKUBE_VERSION also affect which
+# the selected binary for the Kubelet.
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 428bf3422..540bbab7d 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -433,106 +433,115 @@ function run_kuryr_kubernetes {
 source $DEST/kuryr-kubernetes/devstack/lib/kuryr_kubernetes
 
 # main loop
-if is_service_enabled kuryr-kubernetes; then
-    if [[ "$1" == "stack" && "$2" == "install" ]]; then
-        setup_develop "$KURYR_HOME"
-        if is_service_enabled kubelet; then
-            install_kuryr_cni
-        fi
-
-    elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
-        create_kuryr_account
-        configure_kuryr
+if [[ "$1" == "stack" && "$2" == "install" ]]; then
+    setup_develop "$KURYR_HOME"
+    if is_service_enabled kubelet; then
+        install_kuryr_cni
     fi
 
-    if [[ "$1" == "stack" && "$2" == "extra" ]]; then
+elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
+    if is_service_enabled kuryr-kubernetes; then
+        create_kuryr_account
+    fi
+    configure_kuryr
+fi
+
+if [[ "$1" == "stack" && "$2" == "extra" ]]; then
+    if is_service_enabled kuryr-kubernetes; then
         KURYR_CONFIGURE_NEUTRON_DEFAULTS=$(trueorfalse True KURYR_CONFIGURE_NEUTRON_DEFAULTS)
         if [ "$KURYR_CONFIGURE_NEUTRON_DEFAULTS" == "True" ]; then
             configure_neutron_defaults
         fi
-        # FIXME(limao): When Kuryr start up, it need to detect if neutron
-        # support tag plugin.
-        #
-        # Kuryr will call neutron extension API to verify if neutron support
-        # tag.  So Kuryr need to start after neutron-server finish load tag
-        # plugin.  The process of devstack is:
-        #     ...
-        #     run_phase "stack" "post-config"
-        #     ...
-        #     start neutron-server
-        #     ...
-        #     run_phase "stack" "extra"
-        #
-        # If Kuryr start up in "post-config" phase, there is no way to make
-        # sure Kuryr can start before neutron-server, so Kuryr start in "extra"
-        # phase.  Bug: https://bugs.launchpad.net/kuryr/+bug/1587522
+    fi
+    # FIXME(limao): When Kuryr start up, it need to detect if neutron
+    # support tag plugin.
+    #
+    # Kuryr will call neutron extension API to verify if neutron support
+    # tag.  So Kuryr need to start after neutron-server finish load tag
+    # plugin.  The process of devstack is:
+    #     ...
+    #     run_phase "stack" "post-config"
+    #     ...
+    #     start neutron-server
+    #     ...
+    #     run_phase "stack" "extra"
+    #
+    # If Kuryr start up in "post-config" phase, there is no way to make
+    # sure Kuryr can start before neutron-server, so Kuryr start in "extra"
+    # phase.  Bug: https://bugs.launchpad.net/kuryr/+bug/1587522
 
-        if is_service_enabled legacy_etcd; then
-            prepare_etcd_legacy
-            run_etcd_legacy
-        fi
+    if is_service_enabled legacy_etcd; then
+        prepare_etcd_legacy
+        run_etcd_legacy
+    fi
 
-        get_container "$KURYR_HYPERKUBE_IMAGE" "$KURYR_HYPERKUBE_VERSION"
-        prepare_kubernetes_files
-        if is_service_enabled kubernetes-api; then
-            run_k8s_api
-        fi
-        if is_service_enabled kubernetes-controller-manager; then
-            run_k8s_controller_manager
-        fi
-        if is_service_enabled kubernetes-scheduler; then
-            run_k8s_scheduler
-        fi
+    get_container "$KURYR_HYPERKUBE_IMAGE" "$KURYR_HYPERKUBE_VERSION"
+    prepare_kubernetes_files
+    if is_service_enabled kubernetes-api; then
+        run_k8s_api
+    fi
 
-        if is_service_enabled kubelet; then
-            prepare_kubelet
-            extract_hyperkube
-            prepare_kubeconfig
-            run_k8s_kubelet
-            KURYR_CONFIGURE_BAREMETAL_KUBELET_IFACE=$(trueorfalse True KURYR_CONFIGURE_BAREMETAL_KUBELET_IFACE)
-            if [[ "$KURYR_CONFIGURE_BAREMETAL_KUBELET_IFACE" == "True" ]]; then
-                ovs_bind_for_kubelet "$KURYR_NEUTRON_DEFAULT_PROJECT"
-            fi
-            if is_service_enabled tempest; then
-                copy_tempest_kubeconfig
-            fi
-        fi
+    if is_service_enabled kubernetes-controller-manager; then
+        run_k8s_controller_manager
+    fi
 
+    if is_service_enabled kubernetes-scheduler; then
+        run_k8s_scheduler
+    fi
+
+    if is_service_enabled kubelet; then
+        prepare_kubelet
+        extract_hyperkube
+        prepare_kubeconfig
+        run_k8s_kubelet
+        KURYR_CONFIGURE_BAREMETAL_KUBELET_IFACE=$(trueorfalse True KURYR_CONFIGURE_BAREMETAL_KUBELET_IFACE)
+        if [[ "$KURYR_CONFIGURE_BAREMETAL_KUBELET_IFACE" == "True" ]]; then
+            ovs_bind_for_kubelet "$KURYR_NEUTRON_DEFAULT_PROJECT"
+        fi
+    fi
+
+    if is_service_enabled tempest; then
+        copy_tempest_kubeconfig
+    fi
+
+    if is_service_enabled kuryr-kubernetes; then
         run_kuryr_kubernetes
+    fi
 
-    elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
+elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
+    if is_service_enabled kuryr-kubernetes; then
         create_k8s_router_fake_service
         create_k8s_api_service
     fi
+fi
 
-    if [[ "$1" == "unstack" ]]; then
+if [[ "$1" == "unstack" ]]; then
+    if is_service_enabled kuryr-kubernetes; then
         stop_process kuryr-kubernetes
-        docker kill devstack-k8s-setup-files
-        docker rm devstack-k8s-setup-files
-
-        if is_service_enabled kubernetes-controller-manager; then
-            stop_container kubernetes-controller-manager
-        fi
-        if is_service_enabled kubernetes-scheduler; then
-            stop_container kubernetes-scheduler
-        fi
-        if is_service_enabled kubelet; then
-            stop_process kubelet
-        fi
-        if is_service_enabled kubernetes-api; then
-            stop_container kubernetes-api
-        fi
-        if is_service_enabled legacy_etcd; then
-            stop_container etcd
-        fi
-
-        stop_docker
     fi
+    docker kill devstack-k8s-setup-files
+    docker rm devstack-k8s-setup-files
 
-    if [[ "$1" == "clean" ]]; then
-        if is_service_enabled legacy_etcd; then
-            # Cleanup Etcd for the next stacking
-            sudo rm -rf "$KURYR_ETCD_DATA_DIR"
-        fi
+    if is_service_enabled kubernetes-controller-manager; then
+        stop_container kubernetes-controller-manager
+    fi
+    if is_service_enabled kubernetes-scheduler; then
+        stop_container kubernetes-scheduler
+    fi
+    if is_service_enabled kubelet; then
+        stop_process kubelet
+    fi
+    if is_service_enabled kubernetes-api; then
+        stop_container kubernetes-api
+    fi
+    if is_service_enabled legacy_etcd; then
+        stop_container etcd
+    fi
+fi
+
+if [[ "$1" == "clean" ]]; then
+    if is_service_enabled legacy_etcd; then
+        # Cleanup Etcd for the next stacking
+        sudo rm -rf "$KURYR_ETCD_DATA_DIR"
     fi
 fi