diff --git a/cmd/earlystopping/medianstopping/Dockerfile b/cmd/earlystopping/medianstopping/v1alpha1/Dockerfile
similarity index 100%
rename from cmd/earlystopping/medianstopping/Dockerfile
rename to cmd/earlystopping/medianstopping/v1alpha1/Dockerfile
diff --git a/cmd/katib-controller/Dockerfile b/cmd/katib-controller/v1alpha1/Dockerfile
similarity index 71%
rename from cmd/katib-controller/Dockerfile
rename to cmd/katib-controller/v1alpha1/Dockerfile
index 57dd3c5d146..874f440b149 100644
--- a/cmd/katib-controller/Dockerfile
+++ b/cmd/katib-controller/v1alpha1/Dockerfile
@@ -7,10 +7,8 @@ ADD . /go/src/github.com/kubeflow/katib
 WORKDIR /go/src/github.com/kubeflow/katib/cmd/katib-controller
 # Build
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o studyjobcontroller  ./v1alpha1
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o katib-controller.v1alpha2  ./v1alpha2
 # Copy the controller-manager into a thin image
 FROM alpine:3.7
 WORKDIR /app
 COPY --from=build-env /go/src/github.com/kubeflow/katib/cmd/katib-controller/studyjobcontroller .
-COPY --from=build-env /go/src/github.com/kubeflow/katib/cmd/katib-controller/katib-controller.v1alpha2 .
 ENTRYPOINT ["./studyjobcontroller"]
diff --git a/cmd/katib-controller/v1alpha2/Dockerfile b/cmd/katib-controller/v1alpha2/Dockerfile
new file mode 100644
index 00000000000..ed17430140f
--- /dev/null
+++ b/cmd/katib-controller/v1alpha2/Dockerfile
@@ -0,0 +1,14 @@
+# Build the manager binary
+FROM golang:alpine AS build-env
+
+# Copy in the go src
+ADD . /go/src/github.com/kubeflow/katib
+
+WORKDIR /go/src/github.com/kubeflow/katib/cmd/katib-controller
+# Build
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o katib-controller  ./v1alpha2
+# Copy the controller-manager into a thin image
+FROM alpine:3.7
+WORKDIR /app
+COPY --from=build-env /go/src/github.com/kubeflow/katib/cmd/katib-controller/katib-controller .
+ENTRYPOINT ["./katib-controller"]
diff --git a/cmd/manager-rest/Dockerfile b/cmd/manager-rest/v1alpha1/Dockerfile
similarity index 70%
rename from cmd/manager-rest/Dockerfile
rename to cmd/manager-rest/v1alpha1/Dockerfile
index 7af754d7689..84a5d44fa7c 100644
--- a/cmd/manager-rest/Dockerfile
+++ b/cmd/manager-rest/v1alpha1/Dockerfile
@@ -3,10 +3,8 @@ FROM golang:alpine AS build-env
 ADD . /go/src/github.com/kubeflow/katib
 WORKDIR /go/src/github.com/kubeflow/katib/cmd/manager-rest
 RUN go build -o vizier-manager-rest ./v1alpha1
-RUN go build -o katib-manager-rest.v1alpha2 ./v1alpha2
 
 FROM alpine:3.7
 WORKDIR /app
 COPY --from=build-env /go/src/github.com/kubeflow/katib/cmd/manager-rest/vizier-manager-rest /app/
-COPY --from=build-env /go/src/github.com/kubeflow/katib/cmd/manager-rest/katib-manager-rest.v1alpha2 /app/
 ENTRYPOINT ["./vizier-manager-rest"]
diff --git a/cmd/manager-rest/v1alpha2/Dockerfile b/cmd/manager-rest/v1alpha2/Dockerfile
new file mode 100644
index 00000000000..ae0a18cc4a4
--- /dev/null
+++ b/cmd/manager-rest/v1alpha2/Dockerfile
@@ -0,0 +1,10 @@
+FROM golang:alpine AS build-env
+# The GOPATH in the image is /go.
+ADD . /go/src/github.com/kubeflow/katib
+WORKDIR /go/src/github.com/kubeflow/katib/cmd/manager-rest
+RUN go build -o katib-manager-rest ./v1alpha2
+
+FROM alpine:3.7
+WORKDIR /app
+COPY --from=build-env /go/src/github.com/kubeflow/katib/cmd/manager-rest/katib-manager-rest /app/
+ENTRYPOINT ["./katib-manager-rest"]
diff --git a/cmd/manager/Dockerfile b/cmd/manager/v1alpha1/Dockerfile
similarity index 82%
rename from cmd/manager/Dockerfile
rename to cmd/manager/v1alpha1/Dockerfile
index 0646495b822..0977c9cc758 100644
--- a/cmd/manager/Dockerfile
+++ b/cmd/manager/v1alpha1/Dockerfile
@@ -3,7 +3,6 @@ FROM golang:alpine AS build-env
 ADD . /go/src/github.com/kubeflow/katib
 WORKDIR /go/src/github.com/kubeflow/katib/cmd/manager
 RUN go build -o vizier-manager ./v1alpha1
-RUN go build -o katib-manager.v1alpha2 ./v1alpha2
 
 FROM alpine:3.7
 WORKDIR /app
@@ -11,7 +10,6 @@ RUN GRPC_HEALTH_PROBE_VERSION=v0.2.0 && \
     wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
     chmod +x /bin/grpc_health_probe
 COPY --from=build-env /go/src/github.com/kubeflow/katib/cmd/manager/vizier-manager /app/
-COPY --from=build-env /go/src/github.com/kubeflow/katib/cmd/manager/katib-manager.v1alpha2 /app/
 #COPY --from=build-env /go/src/github.com/kubeflow/katib/pkg/manager/v1alpha1/visualise /
 ENTRYPOINT ["./vizier-manager"]
 CMD ["-w", "kubernetes"]
diff --git a/cmd/manager/v1alpha2/Dockerfile b/cmd/manager/v1alpha2/Dockerfile
new file mode 100644
index 00000000000..5ded54ebaf4
--- /dev/null
+++ b/cmd/manager/v1alpha2/Dockerfile
@@ -0,0 +1,15 @@
+FROM golang:alpine AS build-env
+# The GOPATH in the image is /go.
+ADD . /go/src/github.com/kubeflow/katib
+WORKDIR /go/src/github.com/kubeflow/katib/cmd/manager
+RUN go build -o katib-manager ./v1alpha2
+
+FROM alpine:3.7
+WORKDIR /app
+RUN GRPC_HEALTH_PROBE_VERSION=v0.2.0 && \
+    wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
+    chmod +x /bin/grpc_health_probe
+COPY --from=build-env /go/src/github.com/kubeflow/katib/cmd/manager/katib-manager /app/
+#COPY --from=build-env /go/src/github.com/kubeflow/katib/pkg/manager/v1alpha1/visualise /
+ENTRYPOINT ["./katib-manager"]
+CMD ["-w", "kubernetes"]
diff --git a/cmd/metricscollector/Dockerfile b/cmd/metricscollector/v1alpha1/Dockerfile
similarity index 69%
rename from cmd/metricscollector/Dockerfile
rename to cmd/metricscollector/v1alpha1/Dockerfile
index 397ac4c25f8..1a38840aacc 100644
--- a/cmd/metricscollector/Dockerfile
+++ b/cmd/metricscollector/v1alpha1/Dockerfile
@@ -8,10 +8,9 @@ WORKDIR /go/src/github.com/kubeflow/katib/cmd/metricscollector
 
 # Build
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o metricscollector ./v1alpha1
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o metricscollector.v1alpha2 ./v1alpha2
 
 # Copy the controller-manager into a thin image
 FROM alpine:3.7
 WORKDIR /app
 COPY --from=build-env /go/src/github.com/kubeflow/katib/cmd/metricscollector/metricscollector .
-COPY --from=build-env /go/src/github.com/kubeflow/katib/cmd/metricscollector/metricscollector.v1alpha2 .
+ENTRYPOINT ["./metricscollector"]
diff --git a/cmd/metricscollector/v1alpha2/Dockerfile b/cmd/metricscollector/v1alpha2/Dockerfile
new file mode 100644
index 00000000000..4aae2f3d9e7
--- /dev/null
+++ b/cmd/metricscollector/v1alpha2/Dockerfile
@@ -0,0 +1,16 @@
+# Build the manager binary
+FROM golang:alpine AS build-env
+
+# Copy in the go src
+ADD . /go/src/github.com/kubeflow/katib
+
+WORKDIR /go/src/github.com/kubeflow/katib/cmd/metricscollector
+
+# Build
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o metricscollector ./v1alpha2
+
+# Copy the controller-manager into a thin image
+FROM alpine:3.7
+WORKDIR /app
+COPY --from=build-env /go/src/github.com/kubeflow/katib/cmd/metricscollector/metricscollector .
+ENTRYPOINT ["./metricscollector"]
diff --git a/cmd/suggestion/bayesianoptimization/Dockerfile b/cmd/suggestion/bayesianoptimization/v1alpha1/Dockerfile
similarity index 84%
rename from cmd/suggestion/bayesianoptimization/Dockerfile
rename to cmd/suggestion/bayesianoptimization/v1alpha1/Dockerfile
index 26a0dbf8e1e..6d0faca9c3f 100644
--- a/cmd/suggestion/bayesianoptimization/Dockerfile
+++ b/cmd/suggestion/bayesianoptimization/v1alpha1/Dockerfile
@@ -2,7 +2,7 @@ FROM python:3
 
 ADD . /usr/src/app/github.com/kubeflow/katib
 WORKDIR /usr/src/app/github.com/kubeflow/katib/cmd/suggestion/bayesianoptimization/v1alpha1
-RUN pip install --no-cache-dir -r ../requirements.txt
+RUN pip install --no-cache-dir -r requirements.txt
 ENV PYTHONPATH /usr/src/app/github.com/kubeflow/katib:/usr/src/app/github.com/kubeflow/katib/pkg/api/v1alpha1/python
 
 ENTRYPOINT ["python", "main.py"]
diff --git a/cmd/suggestion/bayesianoptimization/README.md b/cmd/suggestion/bayesianoptimization/v1alpha1/README.md
similarity index 100%
rename from cmd/suggestion/bayesianoptimization/README.md
rename to cmd/suggestion/bayesianoptimization/v1alpha1/README.md
diff --git a/cmd/suggestion/bayesianoptimization/requirements.txt b/cmd/suggestion/bayesianoptimization/v1alpha1/requirements.txt
similarity index 100%
rename from cmd/suggestion/bayesianoptimization/requirements.txt
rename to cmd/suggestion/bayesianoptimization/v1alpha1/requirements.txt
diff --git a/cmd/suggestion/grid/Dockerfile b/cmd/suggestion/grid/v1alpha1/Dockerfile
similarity index 100%
rename from cmd/suggestion/grid/Dockerfile
rename to cmd/suggestion/grid/v1alpha1/Dockerfile
diff --git a/cmd/suggestion/hyperband/Dockerfile b/cmd/suggestion/hyperband/v1alpha1/Dockerfile
similarity index 100%
rename from cmd/suggestion/hyperband/Dockerfile
rename to cmd/suggestion/hyperband/v1alpha1/Dockerfile
diff --git a/cmd/suggestion/nasrl/Dockerfile b/cmd/suggestion/nasrl/v1alpha1/Dockerfile
similarity index 88%
rename from cmd/suggestion/nasrl/Dockerfile
rename to cmd/suggestion/nasrl/v1alpha1/Dockerfile
index b91f8ee5ff3..25c873bf6b1 100644
--- a/cmd/suggestion/nasrl/Dockerfile
+++ b/cmd/suggestion/nasrl/v1alpha1/Dockerfile
@@ -3,7 +3,7 @@ FROM python:3.6
 ADD . /usr/src/app/github.com/kubeflow/katib
 WORKDIR /usr/src/app/github.com/kubeflow/katib/cmd/suggestion/nasrl/v1alpha1
 RUN pip install https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.12.0-cp36-cp36m-linux_x86_64.whl
-RUN pip install --no-cache-dir -r ../requirements.txt
+RUN pip install --no-cache-dir -r requirements.txt
 ENV PYTHONPATH /usr/src/app/github.com/kubeflow/katib:/usr/src/app/github.com/kubeflow/katib/pkg/api/v1alpha1/python
 
 ENTRYPOINT ["python", "-u", "main.py"]
diff --git a/cmd/suggestion/nasrl/requirements.txt b/cmd/suggestion/nasrl/v1alpha1/requirements.txt
similarity index 100%
rename from cmd/suggestion/nasrl/requirements.txt
rename to cmd/suggestion/nasrl/v1alpha1/requirements.txt
diff --git a/cmd/suggestion/random/Dockerfile b/cmd/suggestion/random/v1alpha1/Dockerfile
similarity index 100%
rename from cmd/suggestion/random/Dockerfile
rename to cmd/suggestion/random/v1alpha1/Dockerfile
diff --git a/cmd/tfevent-metricscollector/Dockerfile b/cmd/tfevent-metricscollector/v1alpha1/Dockerfile
similarity index 100%
rename from cmd/tfevent-metricscollector/Dockerfile
rename to cmd/tfevent-metricscollector/v1alpha1/Dockerfile
diff --git a/manifests/v1alpha2/katib-controller/katib-controller.yaml b/manifests/v1alpha2/katib-controller/katib-controller.yaml
index 22ad7c2de75..1667d0c4fc9 100644
--- a/manifests/v1alpha2/katib-controller/katib-controller.yaml
+++ b/manifests/v1alpha2/katib-controller/katib-controller.yaml
@@ -20,7 +20,7 @@ spec:
       - name: katib-controller
         image: katib/katib-controller
         imagePullPolicy: Always
-        command: ["./katib-controller.v1alpha2"]
+        command: ["./katib-controller"]
         ports:
         - containerPort: 443
           name: webhook
diff --git a/manifests/v1alpha2/katib-controller/metricsControllerConfigMap.yaml b/manifests/v1alpha2/katib-controller/metricsControllerConfigMap.yaml
index a1d92370309..e49d0c5a31e 100644
--- a/manifests/v1alpha2/katib-controller/metricsControllerConfigMap.yaml
+++ b/manifests/v1alpha2/katib-controller/metricsControllerConfigMap.yaml
@@ -24,7 +24,7 @@ data:
               - name: {{.Trial}}
                 image: katib/metrics-collector
                 args:
-                - "./metricscollector.v1alpha2"
+                - "./metricscollector"
                 - "-e"
                 - "{{.Experiment}}"
                 - "-t"
diff --git a/manifests/v1alpha2/katib/manager/deployment.yaml b/manifests/v1alpha2/katib/manager/deployment.yaml
index 84f8645eb79..f1fc5137754 100644
--- a/manifests/v1alpha2/katib/manager/deployment.yaml
+++ b/manifests/v1alpha2/katib/manager/deployment.yaml
@@ -25,7 +25,7 @@ spec:
                 name: katib-db-secrets
                 key: MYSQL_ROOT_PASSWORD
         command:
-          - './katib-manager.v1alpha2'
+          - './katib-manager'
         ports:
         - name: api
           containerPort: 6789
diff --git a/prow_config.yaml b/prow_config.yaml
index e7889327344..c5a957349ec 100644
--- a/prow_config.yaml
+++ b/prow_config.yaml
@@ -21,16 +21,11 @@ workflows:
     - pkg/ui/*
     - cmd/earlystopping/*
     - cmd/katib-controller/v1alpha1/*
-    - cmd/katib-controller/Dockerfile
     - cmd/manager/v1alpha1/*
-    - cmd/manager/Dockerfile
     - cmd/manager-rest/v1alpha1/*
-    - cmd/manager-rest/Dockerfile
     - cmd/metricscollector/v1alpha1/*
-    - cmd/metricscollector/Dockerfile
     - cmd/suggestion/*
     - cmd/tfevent-metricscollector/v1alpha1/*
-    - cmd/tfevent-metricscollector/Dockerfile
     - cmd/ui/*
     - pkg/util/v1alpha1/*
     - test/e2e/v1alpha1/*
@@ -62,16 +57,11 @@ workflows:
     - pkg/ui/*
     - cmd/earlystopping/*
     - cmd/katib-controller/v1alpha1/*
-    - cmd/katib-controller/Dockerfile
     - cmd/manager/v1alpha1/*
-    - cmd/manager/Dockerfile
     - cmd/manager-rest/v1alpha1/*
-    - cmd/manager-rest/Dockerfile
     - cmd/metricscollector/v1alpha1/*
-    - cmd/metricscollector/Dockerfile
     - cmd/suggestion/*
     - cmd/tfevent-metricscollector/v1alpha1/*
-    - cmd/tfevent-metricscollector/Dockerfile
     - cmd/ui/*
     - pkg/util/v1alpha1/*
     - test/scripts/v1alpha1/*
@@ -101,16 +91,11 @@ workflows:
     - pkg/ui/*
     - cmd/earlystopping/*
     - cmd/katib-controller/v1alpha2/*
-    - cmd/katib-controller/Dockerfile
     - cmd/manager/v1alpha2/*
-    - cmd/manager/Dockerfile
     - cmd/manager-rest/v1alpha2/*
-    - cmd/manager-rest/Dockerfile
     - cmd/metricscollector/v1alpha2/*
-    - cmd/metricscollector/Dockerfile
     - cmd/suggestion/*
     - cmd/tfevent-metricscollector/v1alpha2/*
-    - cmd/tfevent-metricscollector/Dockerfile
     - cmd/ui/*
     - pkg/util/v1alpha2/*
     - test/e2e/v1alpha2/*
@@ -143,16 +128,11 @@ workflows:
     - pkg/ui/*
     - cmd/earlystopping/*
     - cmd/katib-controller/v1alpha2/*
-    - cmd/katib-controller/Dockerfile
     - cmd/manager/v1alpha2/*
-    - cmd/manager/Dockerfile
     - cmd/manager-rest/v1alpha2/*
-    - cmd/manager-rest/Dockerfile
     - cmd/metricscollector/v1alpha2/*
-    - cmd/metricscollector/Dockerfile
     - cmd/suggestion/*
     - cmd/tfevent-metricscollector/v1alpha2/*
-    - cmd/tfevent-metricscollector/Dockerfile
     - cmd/ui/*
     - pkg/util/v1alpha2/*
     - test/scripts/v1alpha2/*
diff --git a/scripts/v1alpha1/build.sh b/scripts/v1alpha1/build.sh
index aa0f0da618d..1b606acada0 100755
--- a/scripts/v1alpha1/build.sh
+++ b/scripts/v1alpha1/build.sh
@@ -26,24 +26,24 @@ SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/../..
 cd ${SCRIPT_ROOT}
 
 echo "Building core image..."
-docker build -t ${PREFIX}/vizier-core -f ${CMD_PREFIX}/manager/Dockerfile .
-docker build -t ${PREFIX}/studyjob-controller -f ${CMD_PREFIX}/katib-controller/Dockerfile .
-docker build -t ${PREFIX}/metrics-collector -f ${CMD_PREFIX}/metricscollector/Dockerfile .
-docker build -t ${PREFIX}/tfevent-metrics-collector -f ${CMD_PREFIX}/tfevent-metricscollector/Dockerfile .
+docker build -t ${PREFIX}/v1alpha1/vizier-core -f ${CMD_PREFIX}/manager/v1alpha1/Dockerfile .
+docker build -t ${PREFIX}/v1alpha1/studyjob-controller -f ${CMD_PREFIX}/katib-controller/v1alpha1/Dockerfile .
+docker build -t ${PREFIX}/v1alpha1/metrics-collector -f ${CMD_PREFIX}/metricscollector/v1alpha1/Dockerfile .
+docker build -t ${PREFIX}/v1alpha1/tfevent-metrics-collector -f ${CMD_PREFIX}/tfevent-metricscollector/v1alpha1/Dockerfile .
 
 echo "Building REST API for core image..."
-docker build -t ${PREFIX}/vizier-core-rest -f ${CMD_PREFIX}/manager-rest/Dockerfile .
+docker build -t ${PREFIX}/v1alpha1/vizier-core-rest -f ${CMD_PREFIX}/manager-rest/v1alpha1/Dockerfile .
 
 echo "Building suggestion images..."
-docker build -t ${PREFIX}/suggestion-random -f ${CMD_PREFIX}/suggestion/random/Dockerfile .
-docker build -t ${PREFIX}/suggestion-grid -f ${CMD_PREFIX}/suggestion/grid/Dockerfile .
-docker build -t ${PREFIX}/suggestion-hyperband -f ${CMD_PREFIX}/suggestion/hyperband/Dockerfile .
-docker build -t ${PREFIX}/suggestion-bayesianoptimization -f ${CMD_PREFIX}/suggestion/bayesianoptimization/Dockerfile .
-docker build -t ${PREFIX}/suggestion-nasrl -f ${CMD_PREFIX}/suggestion/nasrl/Dockerfile .
+docker build -t ${PREFIX}/v1alpha1/suggestion-random -f ${CMD_PREFIX}/suggestion/random/v1alpha1/Dockerfile .
+docker build -t ${PREFIX}/v1alpha1/suggestion-grid -f ${CMD_PREFIX}/suggestion/grid/v1alpha1/Dockerfile .
+docker build -t ${PREFIX}/v1alpha1/suggestion-hyperband -f ${CMD_PREFIX}/suggestion/hyperband/v1alpha1/Dockerfile .
+docker build -t ${PREFIX}/v1alpha1/suggestion-bayesianoptimization -f ${CMD_PREFIX}/suggestion/bayesianoptimization/v1alpha1/Dockerfile .
+docker build -t ${PREFIX}/v1alpha1/suggestion-nasrl -f ${CMD_PREFIX}/suggestion/nasrl/v1alpha1/Dockerfile .
 
 echo "Building earlystopping images..."
-docker build -t ${PREFIX}/earlystopping-medianstopping -f ${CMD_PREFIX}/earlystopping/medianstopping/Dockerfile .
+docker build -t ${PREFIX}/v1alpha1/earlystopping-medianstopping -f ${CMD_PREFIX}/earlystopping/medianstopping/v1alpha1/Dockerfile .
 
 echo "Building UI image..."
-docker build -t ${PREFIX}/katib-ui -f ${CMD_PREFIX}/ui/Dockerfile .
+docker build -t ${PREFIX}/v1alpha1/katib-ui -f ${CMD_PREFIX}/ui/Dockerfile .
 
diff --git a/scripts/v1alpha2/build.sh b/scripts/v1alpha2/build.sh
index 9ecaf25f548..1a2039d4fa9 100755
--- a/scripts/v1alpha2/build.sh
+++ b/scripts/v1alpha2/build.sh
@@ -25,5 +25,8 @@ SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/../..
 
 cd ${SCRIPT_ROOT}
 
-docker build -t ${PREFIX}/katib-controller -f ${CMD_PREFIX}/katib-controller/Dockerfile .
-docker build -t ${PREFIX}/katib-manager -f ${CMD_PREFIX}/manager/Dockerfile .
+echo "Building core image..."
+docker build -t ${PREFIX}/v1alpha2/katib-controller -f ${CMD_PREFIX}/katib-controller/v1alpha2/Dockerfile .
+docker build -t ${PREFIX}/v1alpha2/katib-manager -f ${CMD_PREFIX}/manager/v1alpha2/Dockerfile .
+docker build -t ${PREFIX}/v1alpha2/metrics-collector -f ${CMD_PREFIX}/metricscollector/v1alpha2/Dockerfile .
+
diff --git a/test/scripts/v1alpha1/build-earlystopping-median.sh b/test/scripts/v1alpha1/build-earlystopping-median.sh
index a38ae979b6a..ce8821e288b 100755
--- a/test/scripts/v1alpha1/build-earlystopping-median.sh
+++ b/test/scripts/v1alpha1/build-earlystopping-median.sh
@@ -37,6 +37,6 @@ cp -r vendor ${GO_DIR}/vendor
 
 cd ${GO_DIR}
 
-cp cmd/earlystopping/medianstopping/Dockerfile .
-gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/earlystopping-medianstopping:${VERSION} --project=${PROJECT}
-gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/earlystopping-medianstopping:${VERSION} ${REGISTRY}/${REPO_NAME}/earlystopping-medianstopping:latest --verbosity=info
+cp cmd/earlystopping/medianstopping/v1alpha1/Dockerfile .
+gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/v1alpha1/earlystopping-medianstopping:${VERSION} --project=${PROJECT}
+gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/v1alpha1/earlystopping-medianstopping:${VERSION} ${REGISTRY}/${REPO_NAME}/earlystopping-medianstopping:latest --verbosity=info
diff --git a/test/scripts/v1alpha1/build-manager-rest.sh b/test/scripts/v1alpha1/build-manager-rest.sh
index 9da27f4dfb1..d81c73708e7 100755
--- a/test/scripts/v1alpha1/build-manager-rest.sh
+++ b/test/scripts/v1alpha1/build-manager-rest.sh
@@ -36,6 +36,6 @@ cp -r pkg ${GO_DIR}/pkg
 cp -r vendor ${GO_DIR}/vendor
 
 cd ${GO_DIR}
-cp cmd/manager-rest/Dockerfile .
-gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/vizier-core-rest:${VERSION} --project=${PROJECT}
-gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/vizier-core-rest:${VERSION} ${REGISTRY}/${REPO_NAME}/vizier-core-rest:latest --verbosity=info
+cp cmd/manager-rest/v1alpha1/Dockerfile .
+gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/v1alpha1/vizier-core-rest:${VERSION} --project=${PROJECT}
+gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/v1alpha1/vizier-core-rest:${VERSION} ${REGISTRY}/${REPO_NAME}/vizier-core-rest:latest --verbosity=info
diff --git a/test/scripts/v1alpha1/build-manager.sh b/test/scripts/v1alpha1/build-manager.sh
index 1b2ae6153f0..c9c764b9d91 100755
--- a/test/scripts/v1alpha1/build-manager.sh
+++ b/test/scripts/v1alpha1/build-manager.sh
@@ -36,6 +36,6 @@ cp -r pkg ${GO_DIR}/pkg
 cp -r vendor ${GO_DIR}/vendor
 
 cd ${GO_DIR}
-cp cmd/manager/Dockerfile .
-gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/vizier-core:${VERSION} --project=${PROJECT}
-gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/vizier-core:${VERSION} ${REGISTRY}/${REPO_NAME}/vizier-core:latest --verbosity=info
+cp cmd/manager/v1alpha1/Dockerfile .
+gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/v1alpha1/vizier-core:${VERSION} --project=${PROJECT}
+gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/v1alpha1/vizier-core:${VERSION} ${REGISTRY}/${REPO_NAME}/vizier-core:latest --verbosity=info
diff --git a/test/scripts/v1alpha1/build-studyjobctr.sh b/test/scripts/v1alpha1/build-studyjobctr.sh
index 3104705250b..4be76ae455b 100755
--- a/test/scripts/v1alpha1/build-studyjobctr.sh
+++ b/test/scripts/v1alpha1/build-studyjobctr.sh
@@ -36,16 +36,16 @@ cp -r pkg ${GO_DIR}/pkg
 cp -r vendor ${GO_DIR}/vendor
 
 cd ${GO_DIR}
-cp cmd/katib-controller/Dockerfile .
-gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/studyjob-controller:${VERSION} --project=${PROJECT}
-gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/studyjob-controller:${VERSION} ${REGISTRY}/${REPO_NAME}/studyjob-controller:latest --verbosity=info
+cp cmd/katib-controller/v1alpha1/Dockerfile .
+gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/v1alpha1/studyjob-controller:${VERSION} --project=${PROJECT}
+gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/v1alpha1/studyjob-controller:${VERSION} ${REGISTRY}/${REPO_NAME}/studyjob-controller:latest --verbosity=info
 
 cd ${GO_DIR}
-cp cmd/metricscollector/Dockerfile .
-gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/metrics-collector:${VERSION} --project=${PROJECT}
-gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/metrics-collector:${VERSION} ${REGISTRY}/${REPO_NAME}/metrics-collector:latest --verbosity=info
+cp cmd/metricscollector/v1alpha1/Dockerfile .
+gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/v1alpha1/metrics-collector:${VERSION} --project=${PROJECT}
+gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/v1alpha1/metrics-collector:${VERSION} ${REGISTRY}/${REPO_NAME}/metrics-collector:latest --verbosity=info
 
 cd ${GO_DIR}
-cp cmd/tfevent-metricscollector/Dockerfile .
-gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/tfevent-metrics-collector:${VERSION} --project=${PROJECT}
-gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/tfevent-metrics-collector:${VERSION} ${REGISTRY}/${REPO_NAME}/tfevent-metrics-collector:latest --verbosity=info
+cp cmd/tfevent-metricscollector/v1alpha1/Dockerfile .
+gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/v1alpha1/tfevent-metrics-collector:${VERSION} --project=${PROJECT}
+gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/v1alpha1/tfevent-metrics-collector:${VERSION} ${REGISTRY}/${REPO_NAME}/tfevent-metrics-collector:latest --verbosity=info
diff --git a/test/scripts/v1alpha1/build-suggestion-bo.sh b/test/scripts/v1alpha1/build-suggestion-bo.sh
index f2780b72b1b..b7115fa8674 100755
--- a/test/scripts/v1alpha1/build-suggestion-bo.sh
+++ b/test/scripts/v1alpha1/build-suggestion-bo.sh
@@ -37,6 +37,6 @@ cp -r vendor ${GO_DIR}/vendor
 
 cd ${GO_DIR}
 
-cp cmd/suggestion/bayesianoptimization/Dockerfile .
-gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/suggestion-bayesianoptimization:${VERSION} --project=${PROJECT}
-gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/suggestion-bayesianoptimization:${VERSION} ${REGISTRY}/${REPO_NAME}/suggestion-bayesianoptimization:latest --verbosity=info
+cp cmd/suggestion/bayesianoptimization/v1alpha1/Dockerfile .
+gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/v1alpha1/suggestion-bayesianoptimization:${VERSION} --project=${PROJECT}
+gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/v1alpha1/suggestion-bayesianoptimization:${VERSION} ${REGISTRY}/${REPO_NAME}/suggestion-bayesianoptimization:latest --verbosity=info
diff --git a/test/scripts/v1alpha1/build-suggestion-grid.sh b/test/scripts/v1alpha1/build-suggestion-grid.sh
index 979b6ddd489..b7ff86be3bf 100755
--- a/test/scripts/v1alpha1/build-suggestion-grid.sh
+++ b/test/scripts/v1alpha1/build-suggestion-grid.sh
@@ -37,6 +37,6 @@ cp -r vendor ${GO_DIR}/vendor
 
 cd ${GO_DIR}
 
-cp cmd/suggestion/grid/Dockerfile .
-gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/suggestion-grid:${VERSION} --project=${PROJECT}
-gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/suggestion-grid:${VERSION} ${REGISTRY}/${REPO_NAME}/suggestion-grid:latest --verbosity=info
+cp cmd/suggestion/grid/v1alpha1/Dockerfile .
+gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/v1alpha1/suggestion-grid:${VERSION} --project=${PROJECT}
+gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/v1alpha1/suggestion-grid:${VERSION} ${REGISTRY}/${REPO_NAME}/suggestion-grid:latest --verbosity=info
diff --git a/test/scripts/v1alpha1/build-suggestion-hyperband.sh b/test/scripts/v1alpha1/build-suggestion-hyperband.sh
index a8f3fb7b53f..0af870e814b 100755
--- a/test/scripts/v1alpha1/build-suggestion-hyperband.sh
+++ b/test/scripts/v1alpha1/build-suggestion-hyperband.sh
@@ -37,6 +37,6 @@ cp -r vendor ${GO_DIR}/vendor
 
 cd ${GO_DIR}
 
-cp cmd/suggestion/hyperband/Dockerfile .
-gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/suggestion-hyperband:${VERSION} --project=${PROJECT}
-gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/suggestion-hyperband:${VERSION} ${REGISTRY}/${REPO_NAME}/suggestion-hyperband:latest --verbosity=info
+cp cmd/suggestion/hyperband/v1alpha1/Dockerfile .
+gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/v1alpha1/suggestion-hyperband:${VERSION} --project=${PROJECT}
+gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/v1alpha1/suggestion-hyperband:${VERSION} ${REGISTRY}/${REPO_NAME}/suggestion-hyperband:latest --verbosity=info
diff --git a/test/scripts/v1alpha1/build-suggestion-nasrl.sh b/test/scripts/v1alpha1/build-suggestion-nasrl.sh
index afb49f5c567..d31505161b1 100755
--- a/test/scripts/v1alpha1/build-suggestion-nasrl.sh
+++ b/test/scripts/v1alpha1/build-suggestion-nasrl.sh
@@ -37,6 +37,6 @@ cp -r vendor ${GO_DIR}/vendor
 
 cd ${GO_DIR}
 
-cp cmd/suggestion/nasrl/Dockerfile .
-gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/suggestion-nasrl:${VERSION} --project=${PROJECT}
-gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/suggestion-nasrl:${VERSION} ${REGISTRY}/${REPO_NAME}/suggestion-nasrl:latest --verbosity=info
+cp cmd/suggestion/nasrl/v1alpha1/Dockerfile .
+gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/v1alpha1/suggestion-nasrl:${VERSION} --project=${PROJECT}
+gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/v1alpha1/suggestion-nasrl:${VERSION} ${REGISTRY}/${REPO_NAME}/suggestion-nasrl:latest --verbosity=info
diff --git a/test/scripts/v1alpha1/build-suggestion-random.sh b/test/scripts/v1alpha1/build-suggestion-random.sh
index f81ed1e50d7..eeb9ee520be 100755
--- a/test/scripts/v1alpha1/build-suggestion-random.sh
+++ b/test/scripts/v1alpha1/build-suggestion-random.sh
@@ -37,6 +37,6 @@ cp -r vendor ${GO_DIR}/vendor
 
 cd ${GO_DIR}
 
-cp cmd/suggestion/random/Dockerfile .
-gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/suggestion-random:${VERSION} --project=${PROJECT}
-gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/suggestion-random:${VERSION} ${REGISTRY}/${REPO_NAME}/suggestion-random:latest --verbosity=info
+cp cmd/suggestion/random/v1alpha1/Dockerfile .
+gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/v1alpha1/suggestion-random:${VERSION} --project=${PROJECT}
+gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/v1alpha1/suggestion-random:${VERSION} ${REGISTRY}/${REPO_NAME}/suggestion-random:latest --verbosity=info
diff --git a/test/scripts/v1alpha1/build-ui.sh b/test/scripts/v1alpha1/build-ui.sh
index e513610ba02..88f5b391015 100755
--- a/test/scripts/v1alpha1/build-ui.sh
+++ b/test/scripts/v1alpha1/build-ui.sh
@@ -37,5 +37,5 @@ cp -r vendor ${GO_DIR}/vendor
 
 cd ${GO_DIR}
 cp cmd/ui/Dockerfile .
-gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/katib-ui:${VERSION} --project=${PROJECT} 
-gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/katib-ui:${VERSION} ${REGISTRY}/${REPO_NAME}/katib-ui:latest --verbosity=info
+gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/v1alpha1/katib-ui:${VERSION} --project=${PROJECT} 
+gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/v1alpha1/katib-ui:${VERSION} ${REGISTRY}/${REPO_NAME}/katib-ui:latest --verbosity=info
diff --git a/test/scripts/v1alpha1/python-tests.sh b/test/scripts/v1alpha1/python-tests.sh
index 5cf551e7aba..981e2fd3999 100755
--- a/test/scripts/v1alpha1/python-tests.sh
+++ b/test/scripts/v1alpha1/python-tests.sh
@@ -16,7 +16,7 @@
 
 # This shell script is used to run the python tests in the argo workflow
 
-pip install -r cmd/suggestion/bayesianoptimization/requirements.txt
+pip install -r cmd/suggestion/bayesianoptimization/v1alpha1/requirements.txt
 pip install -r pkg/suggestion/test_requirements.txt
 python setup.py develop
 pylint pkg/suggestion/v1alpha1/bayesianoptimization/src --disable=fixme --exit-zero --reports=y
diff --git a/test/scripts/v1alpha1/run-tests.sh b/test/scripts/v1alpha1/run-tests.sh
index 26e591f19b6..48d73734026 100755
--- a/test/scripts/v1alpha1/run-tests.sh
+++ b/test/scripts/v1alpha1/run-tests.sh
@@ -66,17 +66,18 @@ echo "REGISTRY ${REGISTRY}"
 echo "REPO_NAME ${REPO_NAME}"
 echo "VERSION ${VERSION}"
 
-sed -i -e "s@image: katib\/vizier-core@image: ${REGISTRY}\/${REPO_NAME}\/vizier-core:${VERSION}@" manifests/v1alpha1/vizier/core/deployment.yaml
-sed -i -e "s@image: katib\/vizier-core-rest@image: ${REGISTRY}\/${REPO_NAME}\/vizier-core-rest:${VERSION}@" manifests/v1alpha1/vizier/core-rest/deployment.yaml
-sed -i -e "s@image: katib\/katib-ui@image: ${REGISTRY}\/${REPO_NAME}\/katib-ui:${VERSION}@" manifests/v1alpha1/vizier/ui/deployment.yaml
+sed -i -e "s@image: katib\/vizier-core@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha1\/vizier-core:${VERSION}@" manifests/v1alpha1/vizier/core/deployment.yaml
+sed -i -e "s@image: katib\/vizier-core-rest@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha1\/vizier-core-rest:${VERSION}@" manifests/v1alpha1/vizier/core-rest/deployment.yaml
+sed -i -e "s@image: katib\/katib-ui@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha1\/katib-ui:${VERSION}@" manifests/v1alpha1/vizier/ui/deployment.yaml
 sed -i -e "s@type: NodePort@type: ClusterIP@" -e "/nodePort: 30678/d" manifests/v1alpha1/vizier/core/service.yaml
-sed -i -e "s@image: katib\/studyjob-controller@image: ${REGISTRY}\/${REPO_NAME}\/studyjob-controller:${VERSION}@" manifests/v1alpha1/studyjobcontroller/studyjobcontroller.yaml
-sed -i -e "s@image: katib\/suggestion-random@image: ${REGISTRY}\/${REPO_NAME}\/suggestion-random:${VERSION}@" manifests/v1alpha1/vizier/suggestion/random/deployment.yaml
-sed -i -e "s@image: katib\/suggestion-grid@image: ${REGISTRY}\/${REPO_NAME}\/suggestion-grid:${VERSION}@" manifests/v1alpha1/vizier/suggestion/grid/deployment.yaml
-sed -i -e "s@image: katib\/suggestion-hyperband@image: ${REGISTRY}\/${REPO_NAME}\/suggestion-hyperband:${VERSION}@" manifests/v1alpha1/vizier/suggestion/hyperband/deployment.yaml
-sed -i -e "s@image: katib\/suggestion-bayesianoptimization@image: ${REGISTRY}\/${REPO_NAME}\/suggestion-bayesianoptimization:${VERSION}@" manifests/v1alpha1/vizier/suggestion/bayesianoptimization/deployment.yaml
-sed -i -e "s@image: katib\/suggestion-nasrl@image: ${REGISTRY}\/${REPO_NAME}\/suggestion-nasrl:${VERSION}@" manifests/v1alpha1/vizier/suggestion/nasrl/deployment.yaml
-sed -i -e "s@image: katib\/earlystopping-medianstopping@image: ${REGISTRY}\/${REPO_NAME}\/earlystopping-medianstopping:${VERSION}@" manifests/v1alpha1/vizier/earlystopping/medianstopping/deployment.yaml
+sed -i -e "s@image: katib\/studyjob-controller@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha1\/studyjob-controller:${VERSION}@" manifests/v1alpha1/studyjobcontroller/studyjobcontroller.yaml
+sed -i -e "s@image: katib\/suggestion-random@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha1\/suggestion-random:${VERSION}@" manifests/v1alpha1/vizier/suggestion/random/deployment.yaml
+sed -i -e "s@image: katib\/suggestion-grid@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha1\/suggestion-grid:${VERSION}@" manifests/v1alpha1/vizier/suggestion/grid/deployment.yaml
+sed -i -e "s@image: katib\/suggestion-hyperband@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha1\/suggestion-hyperband:${VERSION}@" manifests/v1alpha1/vizier/suggestion/hyperband/deployment.yaml
+sed -i -e "s@image: katib\/suggestion-bayesianoptimization@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha1\/suggestion-bayesianoptimization:${VERSION}@" manifests/v1alpha1/vizier/suggestion/bayesianoptimization/deployment.yaml
+sed -i -e "s@image: katib\/suggestion-nasrl@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha1\/suggestion-nasrl:${VERSION}@" manifests/v1alpha1/vizier/suggestion/nasrl/deployment.yaml
+
+sed -i -e "s@image: katib\/earlystopping-medianstopping@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha1\/earlystopping-medianstopping:${VERSION}@" manifests/v1alpha1/vizier/earlystopping/medianstopping/deployment.yaml
 sed -i -e '/volumeMounts:/,$d' manifests/v1alpha1/vizier/db/deployment.yaml
 
 cat manifests/v1alpha1/vizier/core/deployment.yaml
diff --git a/test/scripts/v1alpha2/build-earlystopping-median.sh b/test/scripts/v1alpha2/build-earlystopping-median.sh
index 11026efc75e..4da082329f6 100755
--- a/test/scripts/v1alpha2/build-earlystopping-median.sh
+++ b/test/scripts/v1alpha2/build-earlystopping-median.sh
@@ -39,6 +39,6 @@ cp -r vendor ${GO_DIR}/vendor
 
 cd ${GO_DIR}
 
-cp cmd/earlystopping/medianstopping/Dockerfile .
-gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/earlystopping-medianstopping:${VERSION} --project=${PROJECT}
-gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/earlystopping-medianstopping:${VERSION} ${REGISTRY}/${REPO_NAME}/earlystopping-medianstopping:latest --verbosity=info
+#cp cmd/earlystopping/medianstopping/Dockerfile .
+#gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/earlystopping-medianstopping:${VERSION} --project=${PROJECT}
+#gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/earlystopping-medianstopping:${VERSION} ${REGISTRY}/${REPO_NAME}/earlystopping-medianstopping:latest --verbosity=info
diff --git a/test/scripts/v1alpha2/build-katib-controller.sh b/test/scripts/v1alpha2/build-katib-controller.sh
index 1fb7b9f725f..8ca315b35ea 100755
--- a/test/scripts/v1alpha2/build-katib-controller.sh
+++ b/test/scripts/v1alpha2/build-katib-controller.sh
@@ -36,6 +36,6 @@ cp -r pkg ${GO_DIR}/pkg
 cp -r vendor ${GO_DIR}/vendor
 
 cd ${GO_DIR}
-cp cmd/katib-controller/Dockerfile .
-gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/katib-controller:${VERSION} --project=${PROJECT}
-gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/katib-controller:${VERSION} ${REGISTRY}/${REPO_NAME}/katib-controller:latest --verbosity=info
+cp cmd/katib-controller/v1alpha2/Dockerfile .
+gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/v1alpha2/katib-controller:${VERSION} --project=${PROJECT}
+gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/v1alpha2/katib-controller:${VERSION} ${REGISTRY}/${REPO_NAME}/katib-controller:latest --verbosity=info
diff --git a/test/scripts/v1alpha2/build-manager-rest.sh b/test/scripts/v1alpha2/build-manager-rest.sh
index 87596ee7ef7..5cfe879307d 100755
--- a/test/scripts/v1alpha2/build-manager-rest.sh
+++ b/test/scripts/v1alpha2/build-manager-rest.sh
@@ -36,6 +36,6 @@ cp -r pkg ${GO_DIR}/pkg
 cp -r vendor ${GO_DIR}/vendor
 
 cd ${GO_DIR}
-cp cmd/manager-rest/Dockerfile .
-gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/katib-manager-rest:${VERSION} --project=${PROJECT}
-gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/katib-manager-rest:${VERSION} ${REGISTRY}/${REPO_NAME}/katib-manager-rest:latest --verbosity=info
+cp cmd/manager-rest/v1alpha2/Dockerfile .
+gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/v1alpha2/katib-manager-rest:${VERSION} --project=${PROJECT}
+gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/v1alpha2/katib-manager-rest:${VERSION} ${REGISTRY}/${REPO_NAME}/katib-manager-rest:latest --verbosity=info
diff --git a/test/scripts/v1alpha2/build-manager.sh b/test/scripts/v1alpha2/build-manager.sh
index 2db4f11515b..8cc01136069 100755
--- a/test/scripts/v1alpha2/build-manager.sh
+++ b/test/scripts/v1alpha2/build-manager.sh
@@ -36,6 +36,6 @@ cp -r pkg ${GO_DIR}/pkg
 cp -r vendor ${GO_DIR}/vendor
 
 cd ${GO_DIR}
-cp cmd/manager/Dockerfile .
-gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/katib-manager:${VERSION} --project=${PROJECT}
-gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/katib-manager:${VERSION} ${REGISTRY}/${REPO_NAME}/katib-manager:latest --verbosity=info
+cp cmd/manager/v1alpha2/Dockerfile .
+gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/v1alpha2/katib-manager:${VERSION} --project=${PROJECT}
+gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/v1alpha2/katib-manager:${VERSION} ${REGISTRY}/${REPO_NAME}/katib-manager:latest --verbosity=info
diff --git a/test/scripts/v1alpha2/build-suggestion-bo.sh b/test/scripts/v1alpha2/build-suggestion-bo.sh
index 6ecb856d8ca..2b13ae5e05f 100755
--- a/test/scripts/v1alpha2/build-suggestion-bo.sh
+++ b/test/scripts/v1alpha2/build-suggestion-bo.sh
@@ -39,6 +39,6 @@ cp -r vendor ${GO_DIR}/vendor
 
 cd ${GO_DIR}
 
-cp cmd/suggestion/bayesianoptimization/Dockerfile .
-gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/suggestion-bayesianoptimization:${VERSION} --project=${PROJECT}
-gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/suggestion-bayesianoptimization:${VERSION} ${REGISTRY}/${REPO_NAME}/suggestion-bayesianoptimization:latest --verbosity=info
+#cp cmd/suggestion/bayesianoptimization/Dockerfile .
+#gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/suggestion-bayesianoptimization:${VERSION} --project=${PROJECT}
+#gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/suggestion-bayesianoptimization:${VERSION} ${REGISTRY}/${REPO_NAME}/suggestion-bayesianoptimization:latest --verbosity=info
diff --git a/test/scripts/v1alpha2/build-suggestion-grid.sh b/test/scripts/v1alpha2/build-suggestion-grid.sh
index f094ad6de33..0f6001e60d4 100755
--- a/test/scripts/v1alpha2/build-suggestion-grid.sh
+++ b/test/scripts/v1alpha2/build-suggestion-grid.sh
@@ -39,6 +39,6 @@ cp -r vendor ${GO_DIR}/vendor
 
 cd ${GO_DIR}
 
-cp cmd/suggestion/grid/Dockerfile .
-gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/suggestion-grid:${VERSION} --project=${PROJECT}
-gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/suggestion-grid:${VERSION} ${REGISTRY}/${REPO_NAME}/suggestion-grid:latest --verbosity=info
+#cp cmd/suggestion/grid/Dockerfile .
+#gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/suggestion-grid:${VERSION} --project=${PROJECT}
+#gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/suggestion-grid:${VERSION} ${REGISTRY}/${REPO_NAME}/suggestion-grid:latest --verbosity=info
diff --git a/test/scripts/v1alpha2/build-suggestion-hyperband.sh b/test/scripts/v1alpha2/build-suggestion-hyperband.sh
index 376b8ae3444..4f9d0f1464e 100755
--- a/test/scripts/v1alpha2/build-suggestion-hyperband.sh
+++ b/test/scripts/v1alpha2/build-suggestion-hyperband.sh
@@ -39,6 +39,6 @@ cp -r vendor ${GO_DIR}/vendor
 
 cd ${GO_DIR}
 
-cp cmd/suggestion/hyperband/Dockerfile .
-gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/suggestion-hyperband:${VERSION} --project=${PROJECT}
-gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/suggestion-hyperband:${VERSION} ${REGISTRY}/${REPO_NAME}/suggestion-hyperband:latest --verbosity=info
+#cp cmd/suggestion/hyperband/Dockerfile .
+#gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/suggestion-hyperband:${VERSION} --project=${PROJECT}
+#gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/suggestion-hyperband:${VERSION} ${REGISTRY}/${REPO_NAME}/suggestion-hyperband:latest --verbosity=info
diff --git a/test/scripts/v1alpha2/build-suggestion-nasrl.sh b/test/scripts/v1alpha2/build-suggestion-nasrl.sh
index 7be1aca75ed..a347738a37c 100755
--- a/test/scripts/v1alpha2/build-suggestion-nasrl.sh
+++ b/test/scripts/v1alpha2/build-suggestion-nasrl.sh
@@ -38,6 +38,6 @@ cp -r vendor ${GO_DIR}/vendor
 
 cd ${GO_DIR}
 
-cp cmd/suggestion/nasrl/Dockerfile .
-gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/suggestion-nasrl:${VERSION} --project=${PROJECT}
-gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/suggestion-nasrl:${VERSION} ${REGISTRY}/${REPO_NAME}/suggestion-nasrl:latest --verbosity=info
+#cp cmd/suggestion/nasrl/Dockerfile .
+#gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/suggestion-nasrl:${VERSION} --project=${PROJECT}
+#gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/suggestion-nasrl:${VERSION} ${REGISTRY}/${REPO_NAME}/suggestion-nasrl:latest --verbosity=info
diff --git a/test/scripts/v1alpha2/build-suggestion-random.sh b/test/scripts/v1alpha2/build-suggestion-random.sh
index 4d9035ae890..e1b06019ff0 100755
--- a/test/scripts/v1alpha2/build-suggestion-random.sh
+++ b/test/scripts/v1alpha2/build-suggestion-random.sh
@@ -39,6 +39,6 @@ cp -r vendor ${GO_DIR}/vendor
 
 cd ${GO_DIR}
 
-cp cmd/suggestion/random/Dockerfile .
-gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/suggestion-random:${VERSION} --project=${PROJECT}
-gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/suggestion-random:${VERSION} ${REGISTRY}/${REPO_NAME}/suggestion-random:latest --verbosity=info
+#cp cmd/suggestion/random/Dockerfile .
+#gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/suggestion-random:${VERSION} --project=${PROJECT}
+#gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/suggestion-random:${VERSION} ${REGISTRY}/${REPO_NAME}/suggestion-random:latest --verbosity=info
diff --git a/test/scripts/v1alpha2/build-ui.sh b/test/scripts/v1alpha2/build-ui.sh
index c5a7e2fe435..91200e57743 100755
--- a/test/scripts/v1alpha2/build-ui.sh
+++ b/test/scripts/v1alpha2/build-ui.sh
@@ -38,6 +38,6 @@ cp -r pkg ${GO_DIR}/pkg
 cp -r vendor ${GO_DIR}/vendor
 
 cd ${GO_DIR}
-cp cmd/ui/Dockerfile .
-gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/katib-ui:${VERSION} --project=${PROJECT} 
-gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/katib-ui:${VERSION} ${REGISTRY}/${REPO_NAME}/katib-ui:latest --verbosity=info
+#cp cmd/ui/Dockerfile .
+#gcloud builds submit . --tag=${REGISTRY}/${REPO_NAME}/katib-ui:${VERSION} --project=${PROJECT} 
+#gcloud container images add-tag --quiet ${REGISTRY}/${REPO_NAME}/katib-ui:${VERSION} ${REGISTRY}/${REPO_NAME}/katib-ui:latest --verbosity=info
diff --git a/test/scripts/v1alpha2/python-tests.sh b/test/scripts/v1alpha2/python-tests.sh
index 24224d69ce3..822e23e2c26 100755
--- a/test/scripts/v1alpha2/python-tests.sh
+++ b/test/scripts/v1alpha2/python-tests.sh
@@ -18,7 +18,7 @@
 
 exit 0
 
-pip install -r cmd/suggestion/bayesianoptimization/requirements.txt
+pip install -r cmd/suggestion/bayesianoptimization/v1alpha1/requirements.txt
 pip install -r pkg/suggestion/test_requirements.txt
 python setup.py develop
 pylint pkg/suggestion/v1alpha1/bayesianoptimization/src --disable=fixme --exit-zero --reports=y
diff --git a/test/scripts/v1alpha2/run-tests.sh b/test/scripts/v1alpha2/run-tests.sh
index e778bedae39..c0f9d7d7f67 100755
--- a/test/scripts/v1alpha2/run-tests.sh
+++ b/test/scripts/v1alpha2/run-tests.sh
@@ -65,8 +65,8 @@ echo "REGISTRY ${REGISTRY}"
 echo "REPO_NAME ${REPO_NAME}"
 echo "VERSION ${VERSION}"
 
-sed -i -e "s@image: katib\/katib-controller@image: ${REGISTRY}\/${REPO_NAME}\/katib-controller:${VERSION}@" manifests/v1alpha2/katib-controller/katib-controller.yaml
-sed -i -e "s@image: katib\/katib-manager@image: ${REGISTRY}\/${REPO_NAME}\/katib-manager:${VERSION}@" manifests/v1alpha2/katib/manager/deployment.yaml
+sed -i -e "s@image: katib\/katib-controller@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha2\/katib-controller:${VERSION}@" manifests/v1alpha2/katib-controller/katib-controller.yaml
+sed -i -e "s@image: katib\/katib-manager@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha2\/katib-manager:${VERSION}@" manifests/v1alpha2/katib/manager/deployment.yaml
 
 ./scripts/v1alpha2/deploy.sh