diff --git a/Makefile b/Makefile
index 5c761e91..15dba995 100644
--- a/Makefile
+++ b/Makefile
@@ -301,6 +301,9 @@ release-metadata: $(RELEASE_DIR)
 release-templates: $(RELEASE_DIR)
 	cp templates/cluster-template*.yaml $(RELEASE_DIR)/
 
+release-local: ## Builds the manifests for use in local development
+	$(MAKE) release RELEASE_DIR=out/release/infrastructure-tinkerbell/$(RELEASE_TAG)
+
 ## --------------------------------------
 ## Cleanup / Verification
 ## --------------------------------------
diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml
index 2b3b15c3..af4861aa 100644
--- a/config/default/manager_image_patch.yaml
+++ b/config/default/manager_image_patch.yaml
@@ -8,5 +8,5 @@ spec:
     spec:
       containers:
       # Change the value of image field below to your controller image URL
-      - image: ghcr.io/tinkerbell/cluster-api-provider-tinkerbell-amd64:dev
+      - image: ghcr.io/tinkerbell/cluster-api-provider-tinkerbell:dev
         name: manager
diff --git a/config/default/manager_pull_policy.yaml b/config/default/manager_pull_policy.yaml
index 74a0879c..cd7ae12c 100644
--- a/config/default/manager_pull_policy.yaml
+++ b/config/default/manager_pull_policy.yaml
@@ -8,4 +8,4 @@ spec:
     spec:
       containers:
       - name: manager
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent
diff --git a/controller/machine/template.go b/controller/machine/template.go
index 138e9142..36d2a843 100644
--- a/controller/machine/template.go
+++ b/controller/machine/template.go
@@ -35,15 +35,15 @@ tasks:
       - /dev/console:/dev/console
       - /lib/firmware:/lib/firmware:ro
     actions:
-      - name: "stream-image"
-        image: quay.io/tinkerbell-actions/oci2disk:v1.0.0
+      - name: "stream image"
+        image: quay.io/tinkerbell/actions/oci2disk
         timeout: 600
         environment:
           IMG_URL: {{.ImageURL}}
           DEST_DISK: {{.DestDisk}}
           COMPRESSED: true
-      - name: "add-tink-cloud-init-config"
-        image: quay.io/tinkerbell-actions/writefile:v1.0.0
+      - name: "add tink cloud-init config"
+        image: quay.io/tinkerbell/actions/writefile
         timeout: 90
         environment:
           DEST_DISK: {{.DestPartition}}
@@ -67,8 +67,8 @@ tasks:
             manage_etc_hosts: localhost
             warnings:
               dsid_missing_source: off
-      - name: "add-tink-cloud-init-ds-config"
-        image: quay.io/tinkerbell-actions/writefile:v1.0.0
+      - name: "add tink cloud-init ds-config"
+        image: quay.io/tinkerbell/actions/writefile
         timeout: 90
         environment:
           DEST_DISK: {{.DestPartition}}
@@ -80,15 +80,15 @@ tasks:
           DIRMODE: 0700
           CONTENTS: |
             datasource: Ec2
-      - name: "kexec-image"
-        image: ghcr.io/jacobweinstock/waitdaemon:0.1.2
+      - name: "kexec image"
+        image: ghcr.io/jacobweinstock/waitdaemon:0.2.1
         timeout: 90
         pid: host
         environment:
           BLOCK_DEVICE: {{.DestPartition}}
           FS_TYPE: ext4
-          IMAGE: quay.io/tinkerbell-actions/kexec:v1.0.0
-          WAIT_SECONDS: 10
+          IMAGE: quay.io/tinkerbell/actions/kexec
+          WAIT_SECONDS: 5
         volumes:
           - /var/run/docker.sock:/var/run/docker.sock
 `