diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index 4ae21529..00000000
--- a/.dockerignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# More info: https://docs.docker.com/engine/reference/builder/#dockerignore-file
-# Ignore build and test binaries.
-bin/
-testbin/
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 697e98c8..551a0309 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,7 +32,7 @@ jobs:
 
       - name: Publish to GitHub Container Registry
         env:
-          REGISTRY: ghcr.io/appscode
+          REGISTRY: ghcr.io/kluster-manager
           DOCKER_TOKEN: ${{ secrets.LGTM_GITHUB_TOKEN }}
           USERNAME: 1gtm
           APPSCODE_ENV: prod
@@ -43,9 +43,5 @@ jobs:
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
-        with:
-          files: |
-            bin/sidekick-linux-amd64
-            bin/sidekick-linux-arm64
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Dockerfile.dbg b/Dockerfile.dbg
index 05b231f2..41617b7c 100644
--- a/Dockerfile.dbg
+++ b/Dockerfile.dbg
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ghcr.io/appscode/dlv:1.20.1
+FROM ghcr.io/appscode/dlv:1.21.2
 
 FROM {ARG_FROM}
 
diff --git a/Makefile b/Makefile
index 90b1cdcc..5b8013d3 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ CODE_GENERATOR_IMAGE ?= ghcr.io/appscode/gengo:release-1.29
 API_GROUPS           ?= fluxcd:v1alpha1
 
 # Where to push the docker image.
-REGISTRY ?= ghcr.io/appscode
+REGISTRY ?= ghcr.io/kluster-manager
 SRC_REG  ?=
 
 # This version-strategy uses git tags to set the version string
@@ -519,7 +519,7 @@ clean:
 
 .PHONY: run
 run:
-	go run -mod=vendor ./cmd/sidekick run \
+	go run -mod=vendor ./cmd/fluxcd-addon run \
 		--v=3 \
 		--secure-port=8443 \
 		--kubeconfig=$(KUBECONFIG) \