diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 110db16..835b1ab 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -6,7 +6,8 @@ on:
       - "v*.*.*"
 
 env:
-  IMAGE_NAME: ${{ github.repository }}
+  TAG: ${{ github.ref_name }}
+  IMAGE_NAME: ${{ github.repository_owner }}/cluster-api-addon-provider-fleet
   REGISTRY: ghcr.io
 
 jobs:
@@ -55,7 +56,6 @@ jobs:
         run: |
           # this is quite naive, but i don't think we need more for now
           sed -i "s/dev/${TAG}/g" config/default/manager_image_patch.yaml
-          sed -i "s/dev/${TAG}/g" config/default/helm_manager_image_patch.yaml
           just release-manifests
       - name: Release
         uses: softprops/action-gh-release@v2
diff --git a/Tiltfile b/Tiltfile
index d416e7b..c320548 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -9,7 +9,7 @@ features = cfg.get('features', "")
 print("compiling with features: {}".format(features))
 
 local_resource('compile', 'just create-out-dir compile %s' % features)
-docker_build('ghcr.io/rancher-sandbox/cluster-api-fleet-controller', '.', dockerfile='Dockerfile')
+docker_build('ghcr.io/rancher-sandbox/cluster-api-addon-provider-fleet', '.', dockerfile='Dockerfile')
 yaml = kustomize('config/default')
 k8s_yaml(yaml)
 k8s_resource('caapf-controller-manager')
\ No newline at end of file
diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml
index 0717bee..bdad70c 100644
--- a/config/default/manager_image_patch.yaml
+++ b/config/default/manager_image_patch.yaml
@@ -7,7 +7,7 @@ spec:
   template:
     spec:
       containers:
-      - image: ghcr.io/rancher-sandbox/cluster-api-fleet-controller:dev
+      - image: ghcr.io/rancher-sandbox/cluster-api-addon-provider-fleet:dev
         name: manager
-      - image: ghcr.io/rancher-sandbox/cluster-api-fleet-controller:dev
+      - image: ghcr.io/rancher-sandbox/cluster-api-addon-provider-fleet:dev
         name: helm-manager
\ No newline at end of file
diff --git a/justfile b/justfile
index 6f3b2a2..0a36d85 100644
--- a/justfile
+++ b/justfile
@@ -1,4 +1,4 @@
-NAME := "cluster-api-fleet-controller"
+NAME := "cluster-api-addon-provider-fleet"
 KUBE_VERSION := env_var_or_default('KUBE_VERSION', '1.30.0')
 ORG := "ghcr.io/rancher-sandbox"
 TAG := "dev"