diff --git a/Makefile b/Makefile
index de0be0a..27f6156 100644
--- a/Makefile
+++ b/Makefile
@@ -194,9 +194,12 @@
 release-operator: generate
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o build/bin/manager-linux-amd64 cmd/manager/manager.go
 
+release-adapter: generate
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o build/bin/adapter-linux-amd64 cmd/adapter/adapter.go
+
 RELEASE_SCRIPTS := ./build/package/release.sh
 
-release-binary: release-operator
+release-binary: release-operator release-adapter
 	${RELEASE_SCRIPTS} -b
 	
 release-source:
diff --git a/build/images/Dockerfile.adapter b/build/images/Dockerfile.adapter
index c1d96da..9ba5731 100644
--- a/build/images/Dockerfile.adapter
+++ b/build/images/Dockerfile.adapter
@@ -34,8 +34,8 @@
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
 FROM gcr.io/distroless/static:nonroot
-WORKDIR /tmp
-COPY --from=builder --chown=nonroot:nonroot /workspace/adapter /bin/adapter-amd64
+WORKDIR /
+COPY --from=builder --chown=nonroot:nonroot /workspace/adapter .
 USER nonroot:nonroot
 
-ENTRYPOINT ["/bin/adapter-amd64"]
+ENTRYPOINT ["/adapter"]
diff --git a/build/images/Dockerfile.release b/build/images/Dockerfile.release
index b2edae5..9ee1d33 100644
--- a/build/images/Dockerfile.release
+++ b/build/images/Dockerfile.release
@@ -51,6 +51,7 @@
 FROM gcr.io/distroless/static:nonroot
 WORKDIR /tmp
 COPY --from=builder --chown=nonroot:nonroot /swck/bin/manager-linux-amd64 /manager
+COPY --from=builder --chown=nonroot:nonroot /swck/bin/adapter-linux-amd64 /adapter
 USER nonroot:nonroot
 
 ENTRYPOINT ["/manager"]
diff --git a/build/package/release.sh b/build/package/release.sh
index be60f32..3f4e838 100755
--- a/build/package/release.sh
+++ b/build/package/release.sh
@@ -33,11 +33,14 @@
     cp -Rfv ${ROOTDIR}/README.md ${bindir}
     cp -Rfv ${ROOTDIR}/dist/* ${bindir}
     # Generates CRDs and deployment manifests
-    kustomize build config/crd > ${bindir}/config/crds.yaml
-    pushd ${ROOTDIR}/config/manager
+    pushd ${ROOTDIR}/config/operator/manager
     kustomize edit set image controller=apache/skywalking-swck:${RELEASE_TAG}
     popd
-    kustomize build config/default > ${bindir}/config/deploy.yaml
+    kustomize build config/operator/default > ${bindir}/config/operator-bundle.yaml
+    pushd ${ROOTDIR}/config/adapter/namespaced/adapter
+    kustomize edit set image metrics-adapter=apache/skywalking-swck:${RELEASE_TAG}
+    popd
+    kustomize build config/adapter > ${bindir}/config/adapter-bundle.yaml
     # Package
     tar -czf ${BUILDDIR}/release/skywalking-swck-${RELEASE_TAG}-bin.tgz -C ${bindir} .
     rm -rf ${bindir}
diff --git a/config/adapter/namespaced/adapter/adapter.yaml b/config/adapter/namespaced/adapter/adapter.yaml
index 7e99d08..f72b806 100644
--- a/config/adapter/namespaced/adapter/adapter.yaml
+++ b/config/adapter/namespaced/adapter/adapter.yaml
@@ -42,7 +42,7 @@
         - name: adapter
           image: metrics-adapter:latest
           imagePullPolicy: IfNotPresent
-          command: ["/bin/adapter-amd64"]
+          command: ["/adapter"]
           args:
             - --secure-port=6443
             - --logtostderr=true