diff --git a/Makefile b/Makefile
index 83a5a00c..eb436a8c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 
 # Image URL to use all building/pushing image targets
-IMG ?= kubedl/kubedl:v0.2.0
+IMG ?= kubedl/kubedl:v0.3.0
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
 CRD_OPTIONS ?= "crd:trivialVersions=true,maxDescLen=0"
 
diff --git a/config/manager/all_in_one.yaml b/config/manager/all_in_one.yaml
index 83d3b0e8..7a66f4b7 100644
--- a/config/manager/all_in_one.yaml
+++ b/config/manager/all_in_one.yaml
@@ -314,7 +314,7 @@ spec:
         app: kubedl
     spec:
       containers:
-      - image: kubedl/kubedl:v0.2.0
+      - image: kubedl/kubedl:v0.3.0
         imagePullPolicy: Always
         name: kubedl-manager
         ports:
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index b15adcf2..aad28ab8 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: kubedl/kubedl
-  newTag: v0.2.0
+  newTag: v0.3.0
diff --git a/controllers/xgboost/pod_test.go b/controllers/xgboost/pod_test.go
index d1fc42c0..6c7bcae3 100644
--- a/controllers/xgboost/pod_test.go
+++ b/controllers/xgboost/pod_test.go
@@ -68,7 +68,7 @@ func NewXGBoostReplicaSpecTemplate() corev1.PodTemplateSpec {
 			Containers: []corev1.Container{
 				corev1.Container{
 					Name:  v1alpha1.XGBoostJobDefaultContainerName,
-					Image: "test-image-for-kubeflow-xgboost-operator:latest",
+					Image: "test-image-for-xgboost-operator:latest",
 					Args:  []string{"Fake", "Fake"},
 					Ports: []corev1.ContainerPort{
 						corev1.ContainerPort{
diff --git a/docs/hostnetwork.md b/docs/hostnetwork.md
index 147968b8..5e355f6f 100644
--- a/docs/hostnetwork.md
+++ b/docs/hostnetwork.md
@@ -13,7 +13,7 @@ KubeDL provide a feature-gate to enable `hostnetwork` mode for jobs, users only
 `kubedl.io/network-mode: host` to job specifications, for example:
 
 ```yaml
-    apiVersion: "kubeflow.org/v1"
+    apiVersion: "training.kubedl.io/v1alpha1"
     kind: "TFJob"
     metadata:
       name: "mnist"
diff --git a/docs/tensorboard.md b/docs/tensorboard.md
index e557716b..8fa834a5 100644
--- a/docs/tensorboard.md
+++ b/docs/tensorboard.md
@@ -10,7 +10,7 @@ After that, users can access the tensorboard through this URL `http://<ingress h
 
 For example:
 ```yaml
-    apiVersion: "kubeflow.org/v1"
+    apiVersion: "training.kubedl.io/v1alpha1"
     kind: "TFJob"
     metadata:
       name: "mnist"
diff --git a/example/pytorch/pytorch_job_mnist_mpi.yaml b/example/pytorch/pytorch_job_mnist_mpi.yaml
index 1de35a89..d10d6550 100644
--- a/example/pytorch/pytorch_job_mnist_mpi.yaml
+++ b/example/pytorch/pytorch_job_mnist_mpi.yaml
@@ -13,7 +13,6 @@ spec:
           containers:
             - name: pytorch
               image: kubedl/pytorch-dist-example
-              imagePullPolicy: Always
     Worker:
       replicas: 2
       restartPolicy: ExitCode
@@ -22,4 +21,3 @@ spec:
           containers:
             - name: pytorch
               image: kubedl/pytorch-dist-example
-              imagePullPolicy: Always
diff --git a/example/xgboost/xgboostjob_v1alpha1_iris_train.yaml b/example/xgboost/xgboostjob_v1alpha1_iris_train.yaml
index 79dcb832..07167213 100644
--- a/example/xgboost/xgboostjob_v1alpha1_iris_train.yaml
+++ b/example/xgboost/xgboostjob_v1alpha1_iris_train.yaml
@@ -1,47 +1,28 @@
 apiVersion: training.kubedl.io/v1alpha1
 kind: "XGBoostJob"
 metadata:
-  name: "xgboost-dist-iris-test-train"
+  name: "xgboost-dist-test"
 spec:
   xgbReplicaSpecs:
     Master:
       replicas: 1
       restartPolicy: Never
       template:
-        apiVersion: v1
-        kind: Pod
         spec:
           containers:
-            - name: xgboostjob
-              image: docker.io/merlintang/xgboost-dist-iris:1.1
-              ports:
-                - containerPort: 9991
-                  name: xgboostjob-port
-              imagePullPolicy: Always
-              args:
-                - --job_type=Train
-                - --xgboost_parameter=objective:multi:softprob,num_class:3
-                - --n_estimators=10
-                - --learning_rate=0.1
-                - --model_path=autoAI/xgb-opt/2
-                - --model_storage_type=oss
-                - --oss_param=unknown
+          - name: xgboostjob
+            image: docker.io/merlintang/xgboost-dist-rabit-test:1.2
+            ports:
+            - containerPort: 9991
+              name: xgboostjob-port
     Worker:
       replicas: 2
-      restartPolicy: ExitCode
+      restartPolicy: Never
       template:
-        apiVersion: v1
-        kind: Pod
         spec:
           containers:
-            - name: xgboostjob
-              image: docker.io/merlintang/xgboost-dist-iris:1.1
-              ports:
-                - containerPort: 9991
-                  name: xgboostjob-port
-              imagePullPolicy: Always
-              args:
-                - --job_type=Train
-                - --xgboost_parameter="objective:multi:softprob,num_class:3"
-                - --n_estimators=10
-                - --learning_rate=0.1
\ No newline at end of file
+          - name: xgboostjob
+            image: docker.io/merlintang/xgboost-dist-rabit-test:1.2
+            ports:
+            - containerPort: 9991
+              name: xgboostjob-port
\ No newline at end of file
diff --git a/helm/kubedl/values.yaml b/helm/kubedl/values.yaml
index 232e6f96..8a5a7965 100644
--- a/helm/kubedl/values.yaml
+++ b/helm/kubedl/values.yaml
@@ -8,7 +8,7 @@ image:
   repository: kubedl/kubedl
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: v0.2.0
+  tag: v0.3.0
 
 imagePullSecrets: []
 nameOverride: ""
diff --git a/pkg/job_controller/api/v1/doc.go b/pkg/job_controller/api/v1/doc.go
index 48b85e8c..dff9d55a 100644
--- a/pkg/job_controller/api/v1/doc.go
+++ b/pkg/job_controller/api/v1/doc.go
@@ -17,5 +17,5 @@
 // +k8s:openapi-gen=true
 
 // Package v1 is the v1 version of the API.
-// +groupName=kubeflow.org
+// +groupName=training.kubedl.io
 package v1
diff --git a/pkg/test_job/v1/constants.go b/pkg/test_job/v1/constants.go
index 6e481d3d..cfd3e2ad 100644
--- a/pkg/test_job/v1/constants.go
+++ b/pkg/test_job/v1/constants.go
@@ -19,8 +19,6 @@ import (
 )
 
 const (
-	// EnvKubeflowNamespace is ENV for kubeflow namespace specified by user.
-	EnvKubeflowNamespace = "KUBEFLOW_NAMESPACE"
 
 	// DefaultPortName is name of the port used to communicate between workers.
 	DefaultPortName = "job-port"
diff --git a/pkg/test_job/v1/doc.go b/pkg/test_job/v1/doc.go
index 9bee493b..15dc4fff 100644
--- a/pkg/test_job/v1/doc.go
+++ b/pkg/test_job/v1/doc.go
@@ -17,5 +17,5 @@
 // +k8s:openapi-gen=true
 
 // Package v1 is the v1 version of the API.
-// +groupName=kubeflow.org
+// +groupName=training.kubedl.io
 package v1
diff --git a/pkg/test_job/v1/register.go b/pkg/test_job/v1/register.go
index 8b893be5..c6111d32 100644
--- a/pkg/test_job/v1/register.go
+++ b/pkg/test_job/v1/register.go
@@ -30,7 +30,7 @@ var (
 
 const (
 	// GroupName is the group name use in this package.
-	GroupName = "kubeflow.org"
+	GroupName = "kubedl.io"
 	// Kind is the kind name.
 	Kind = "TestJob"
 	// GroupVersion is the version.
@@ -40,7 +40,7 @@ const (
 	// Singular is the singular for TestJob.
 	Singular = "testjob"
 	// TESTCRD is the CRD name for TestJob.
-	TESTCRD = "testjobs.kubeflow.org"
+	TESTCRD = "testjobs.kubedl.io"
 )
 
 var (
diff --git a/pkg/test_util/v1/const.go b/pkg/test_util/v1/const.go
index 7c3d5cc3..1371b966 100644
--- a/pkg/test_util/v1/const.go
+++ b/pkg/test_util/v1/const.go
@@ -19,7 +19,7 @@ import (
 )
 
 const (
-	TestImageName = "test-image-for-kubeflow-pkg:latest"
+	TestImageName = "test-image-for-pkg:latest"
 	TestJobName   = "test-job"
 	LabelWorker   = "worker"
 
diff --git a/pkg/util/util.go b/pkg/util/util.go
index 37daa2f1..04e04432 100644
--- a/pkg/util/util.go
+++ b/pkg/util/util.go
@@ -25,11 +25,6 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-const (
-	// EnvKubeflowNamespace is a environment variable for namespace when deployed on kubernetes
-	EnvKubeflowNamespace = "KUBEFLOW_NAMESPACE"
-)
-
 // Pformat returns a pretty format output of any value that can be marshaled to JSON.
 func Pformat(value interface{}) string {
 	if s, ok := value.(string); ok {