diff --git a/cmd/db-manager/v1beta1/Dockerfile b/cmd/db-manager/v1beta1/Dockerfile
index d43e403390f..d36cdd10077 100644
--- a/cmd/db-manager/v1beta1/Dockerfile
+++ b/cmd/db-manager/v1beta1/Dockerfile
@@ -1,7 +1,7 @@
 # Build the Katib DB manager.
 FROM golang:alpine AS build-env
 
-ENV GRPC_HEALTH_PROBE_VERSION v0.4.6
+ENV GRPC_HEALTH_PROBE_VERSION v0.4.11
 
 WORKDIR /go/src/github.com/kubeflow/katib
 
diff --git a/cmd/katib-controller/v1beta1/Dockerfile b/cmd/katib-controller/v1beta1/Dockerfile
index fde86a198b2..df056452533 100644
--- a/cmd/katib-controller/v1beta1/Dockerfile
+++ b/cmd/katib-controller/v1beta1/Dockerfile
@@ -14,11 +14,11 @@ COPY pkg/ pkg/
 
 # Build the binary.
 RUN if [ "$(uname -m)" = "ppc64le" ]; then \
-    CGO_ENABLED=0 GOOS=linux GOARCH=ppc64le go build -a -o katib-controller  ./cmd/katib-controller/v1beta1; \
+    CGO_ENABLED=0 GOOS=linux GOARCH=ppc64le go build -a -o katib-controller ./cmd/katib-controller/v1beta1; \
     elif [ "$(uname -m)" = "aarch64" ]; then \
-    CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -a -o katib-controller  ./cmd/katib-controller/v1beta1; \
+    CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -a -o katib-controller ./cmd/katib-controller/v1beta1; \
     else \
-    CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o katib-controller  ./cmd/katib-controller/v1beta1; \
+    CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o katib-controller ./cmd/katib-controller/v1beta1; \
     fi
 
 # Copy the controller-manager into a thin image.
diff --git a/cmd/suggestion/chocolate/v1beta1/Dockerfile b/cmd/suggestion/chocolate/v1beta1/Dockerfile
index a625f7e0c58..2662c015dfb 100644
--- a/cmd/suggestion/chocolate/v1beta1/Dockerfile
+++ b/cmd/suggestion/chocolate/v1beta1/Dockerfile
@@ -2,7 +2,7 @@ FROM python:3.9
 
 ENV TARGET_DIR /opt/katib
 ENV SUGGESTION_DIR cmd/suggestion/chocolate/v1beta1
-ENV GRPC_HEALTH_PROBE_VERSION v0.4.6
+ENV GRPC_HEALTH_PROBE_VERSION v0.4.11
 
 RUN if [ "$(uname -m)" = "ppc64le" ] || [ "$(uname -m)" = "aarch64" ]; then \
     apt-get -y update && \
diff --git a/cmd/suggestion/goptuna/v1beta1/Dockerfile b/cmd/suggestion/goptuna/v1beta1/Dockerfile
index 5e9f0883113..ffd68e20926 100644
--- a/cmd/suggestion/goptuna/v1beta1/Dockerfile
+++ b/cmd/suggestion/goptuna/v1beta1/Dockerfile
@@ -1,7 +1,7 @@
 # Build the Goptuna Suggestion.
 FROM golang:alpine AS build-env
 
-ENV GRPC_HEALTH_PROBE_VERSION v0.4.6
+ENV GRPC_HEALTH_PROBE_VERSION v0.4.11
 
 WORKDIR /go/src/github.com/kubeflow/katib
 
diff --git a/cmd/suggestion/hyperband/v1beta1/Dockerfile b/cmd/suggestion/hyperband/v1beta1/Dockerfile
index f52e7dcc301..4f2e7335daa 100644
--- a/cmd/suggestion/hyperband/v1beta1/Dockerfile
+++ b/cmd/suggestion/hyperband/v1beta1/Dockerfile
@@ -2,7 +2,7 @@ FROM python:3.9
 
 ENV TARGET_DIR /opt/katib
 ENV SUGGESTION_DIR cmd/suggestion/hyperband/v1beta1
-ENV GRPC_HEALTH_PROBE_VERSION v0.4.6
+ENV GRPC_HEALTH_PROBE_VERSION v0.4.11
 
 RUN if [ "$(uname -m)" = "ppc64le" ] || [ "$(uname -m)" = "aarch64" ]; then \
     apt-get -y update && \
diff --git a/cmd/suggestion/hyperopt/v1beta1/Dockerfile b/cmd/suggestion/hyperopt/v1beta1/Dockerfile
index 326a7b75758..1a7e15b1d5a 100644
--- a/cmd/suggestion/hyperopt/v1beta1/Dockerfile
+++ b/cmd/suggestion/hyperopt/v1beta1/Dockerfile
@@ -2,7 +2,7 @@ FROM python:3.9
 
 ENV TARGET_DIR /opt/katib
 ENV SUGGESTION_DIR cmd/suggestion/hyperopt/v1beta1
-ENV GRPC_HEALTH_PROBE_VERSION v0.4.6
+ENV GRPC_HEALTH_PROBE_VERSION v0.4.11
 
 RUN if [ "$(uname -m)" = "ppc64le" ] || [ "$(uname -m)" = "aarch64" ]; then \
     apt-get -y update && \
diff --git a/cmd/suggestion/nas/darts/v1beta1/Dockerfile b/cmd/suggestion/nas/darts/v1beta1/Dockerfile
index 06460684fa9..9a82cce97b9 100644
--- a/cmd/suggestion/nas/darts/v1beta1/Dockerfile
+++ b/cmd/suggestion/nas/darts/v1beta1/Dockerfile
@@ -2,7 +2,7 @@ FROM python:3.9
 
 ENV TARGET_DIR /opt/katib
 ENV SUGGESTION_DIR cmd/suggestion/nas/darts/v1beta1
-ENV GRPC_HEALTH_PROBE_VERSION v0.4.6
+ENV GRPC_HEALTH_PROBE_VERSION v0.4.11
 
 RUN if [ "$(uname -m)" = "ppc64le" ] || [ "$(uname -m)" = "aarch64" ]; then \
     apt-get -y update && \
diff --git a/cmd/suggestion/nas/enas/v1beta1/Dockerfile b/cmd/suggestion/nas/enas/v1beta1/Dockerfile
index c5d332c7597..597868d80f0 100644
--- a/cmd/suggestion/nas/enas/v1beta1/Dockerfile
+++ b/cmd/suggestion/nas/enas/v1beta1/Dockerfile
@@ -2,7 +2,7 @@ FROM python:3.9
 
 ENV TARGET_DIR /opt/katib
 ENV SUGGESTION_DIR cmd/suggestion/nas/enas/v1beta1
-ENV GRPC_HEALTH_PROBE_VERSION v0.4.6
+ENV GRPC_HEALTH_PROBE_VERSION v0.4.11
 # tensorflow community build for aarch64
 # https://github.com/tensorflow/build#tensorflow-builds
 ENV PIP_EXTRA_INDEX_URL https://snapshots.linaro.org/ldcg/python-cache/
diff --git a/cmd/suggestion/optuna/v1beta1/Dockerfile b/cmd/suggestion/optuna/v1beta1/Dockerfile
index fe5b9a22789..8f1c6cebf47 100644
--- a/cmd/suggestion/optuna/v1beta1/Dockerfile
+++ b/cmd/suggestion/optuna/v1beta1/Dockerfile
@@ -2,7 +2,7 @@ FROM python:3.9
 
 ENV TARGET_DIR /opt/katib
 ENV SUGGESTION_DIR cmd/suggestion/optuna/v1beta1
-ENV GRPC_HEALTH_PROBE_VERSION v0.4.6
+ENV GRPC_HEALTH_PROBE_VERSION v0.4.11
 
 RUN if [ "$(uname -m)" = "ppc64le" ] || [ "$(uname -m)" = "aarch64" ]; then \
     apt-get -y update && \
diff --git a/cmd/suggestion/skopt/v1beta1/Dockerfile b/cmd/suggestion/skopt/v1beta1/Dockerfile
index 7d180859e51..489b4a53884 100644
--- a/cmd/suggestion/skopt/v1beta1/Dockerfile
+++ b/cmd/suggestion/skopt/v1beta1/Dockerfile
@@ -2,7 +2,7 @@ FROM python:3.9
 
 ENV TARGET_DIR /opt/katib
 ENV SUGGESTION_DIR cmd/suggestion/skopt/v1beta1
-ENV GRPC_HEALTH_PROBE_VERSION v0.4.6
+ENV GRPC_HEALTH_PROBE_VERSION v0.4.11
 
 RUN if [ "$(uname -m)" = "ppc64le" ] || [ "$(uname -m)" = "aarch64" ]; then \
     apt-get -y update && \
diff --git a/examples/v1beta1/kubeflow-training-operator/tfjob-mnist-with-summaries.yaml b/examples/v1beta1/kubeflow-training-operator/tfjob-mnist-with-summaries.yaml
index 90c3dc81a2e..920ecd2c9d1 100644
--- a/examples/v1beta1/kubeflow-training-operator/tfjob-mnist-with-summaries.yaml
+++ b/examples/v1beta1/kubeflow-training-operator/tfjob-mnist-with-summaries.yaml
@@ -29,10 +29,13 @@ spec:
     - name: batch_size
       parameterType: int
       feasibleSpace:
-        min: "10"
-        max: "20"
+        min: "32"
+        max: "64"
   trialTemplate:
     primaryContainerName: tensorflow
+    # In this example we can collect metrics only from the Worker pods.
+    primaryPodLabels:
+      training.kubeflow.org/replica-type: worker
     trialParameters:
       - name: learningRate
         description: Learning rate for the training model