diff --git a/Makefile b/Makefile
index e0db01b197..99c3b022e8 100644
--- a/Makefile
+++ b/Makefile
@@ -210,6 +210,7 @@ generate-staging-buildspec: | ensure-locale
 	build/lib/generate_staging_buildspec.sh $(BASE_DIRECTORY) "isc-projects_dhcp" "$(BASE_DIRECTORY)/projects/isc-projects/dhcp/buildspecs/batch-build.yml" "$(BASE_DIRECTORY)/buildspec.yml" true
 	build/lib/generate_staging_buildspec.sh $(BASE_DIRECTORY) "tinkerbell_hook" "$(BASE_DIRECTORY)/projects/tinkerbell/hook/buildspecs/batch-build.yml" "$(BASE_DIRECTORY)/buildspec.yml" true
 	build/lib/generate_staging_buildspec.sh $(BASE_DIRECTORY) "tinkerbell_ipxedust" "$(BASE_DIRECTORY)/projects/tinkerbell/ipxedust/buildspecs/batch-build.yml" "$(BASE_DIRECTORY)/buildspec.yml" true
+	build/lib/generate_staging_buildspec.sh $(BASE_DIRECTORY) "tinkerbell_rufio" "$(BASE_DIRECTORY)/projects/tinkerbell/rufio/buildspecs/batch-build.yml" "$(BASE_DIRECTORY)/buildspec.yml" true
 	build/lib/generate_staging_buildspec.sh $(BASE_DIRECTORY) "tinkerbell_tink" "$(BASE_DIRECTORY)/projects/tinkerbell/tink/buildspecs/batch-build.yml" "$(BASE_DIRECTORY)/buildspec.yml" true
 	build/lib/generate_staging_buildspec.sh $(BASE_DIRECTORY) "linuxkit_linuxkit" "$(BASE_DIRECTORY)/projects/linuxkit/linuxkit/buildspecs/batch-build.yml" "$(BASE_DIRECTORY)/buildspec.yml" true
 	build/lib/generate_staging_buildspec.sh $(BASE_DIRECTORY) "emissary-ingress_emissary" "$(BASE_DIRECTORY)/projects/emissary-ingress/emissary/buildspecs/batch-build.yml" "$(BASE_DIRECTORY)/buildspec.yml" true "DO_NOT_EXCLUDE_FROM_BUILDSPEC"
diff --git a/projects/aws/cluster-api-provider-aws-snow/Makefile b/projects/aws/cluster-api-provider-aws-snow/Makefile
index aa98670f1f..75ba2526cf 100644
--- a/projects/aws/cluster-api-provider-aws-snow/Makefile
+++ b/projects/aws/cluster-api-provider-aws-snow/Makefile
@@ -10,6 +10,7 @@ SIMPLE_CREATE_TARBALLS=false
 HAS_LICENSES=false
 IMAGE_COMPONENT=aws/cluster-api-provider-aws-snow/manager
 
+EXCLUDE_FROM_STAGING_BUILDSPEC=true
 EXCLUDE_FROM_CHECKSUMS_BUILDSPEC=true
 EXCLUDE_FROM_UPGRADE_BUILDSPEC=true
 
diff --git a/projects/tinkerbell/rufio/Makefile b/projects/tinkerbell/rufio/Makefile
index 183a7e7d0e..62695465d5 100644
--- a/projects/tinkerbell/rufio/Makefile
+++ b/projects/tinkerbell/rufio/Makefile
@@ -11,6 +11,20 @@ SOURCE_PATTERNS=.
 
 HAS_S3_ARTIFACTS=true
 
+# we need to set IMAGE_BUILD_ARGS here even though its the same as the default. 
+# it is set in Common.mk on the images target (https://github.com/aws/eks-anywhere-build-tooling/blob/8b6d6d66974e881b22e3c9c8ea29adc26f7df5fd/Common.mk#L799)
+# and the combine-images target (https://github.com/aws/eks-anywhere-build-tooling/blob/8b6d6d66974e881b22e3c9c8ea29adc26f7df5fd/Common.mk#L846)
+# since combine-images has images as prereq target, the ?= does not really behave as one might expect.
+# the images target being the actual action, its version of the set takes prioirty and resets to empty
+# setting it explicitly to empty here takes allows the combine-images override to take proirty
+IMAGE_BUILD_ARGS=
+DOCKERFILE_FOLDER=./docker/linux
+BUILDSPECS=buildspec.yml buildspecs/combine-images.yml
+BUILDSPEC_1_DEPENDS_ON_OVERRIDE=none
+BUILDSPEC_1_VARS_KEYS=IMAGE_PLATFORMS
+BUILDSPEC_1_VARS_VALUES=IMAGE_PLATFORMS
+BUILDSPEC_1_ARCH_TYPES=LINUX_CONTAINER ARM_CONTAINER
+
 include $(BASE_DIRECTORY)/Common.mk
 
 s3-artifacts: create-manifests
diff --git a/projects/tinkerbell/rufio/buildspecs/batch-build.yml b/projects/tinkerbell/rufio/buildspecs/batch-build.yml
new file mode 100644
index 0000000000..d0a09919d5
--- /dev/null
+++ b/projects/tinkerbell/rufio/buildspecs/batch-build.yml
@@ -0,0 +1,48 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#      http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file was generated by running `make generate`. DO NOT EDIT
+
+batch:
+  fast-fail: true
+  build-graph:
+    - identifier: tinkerbell_rufio_linux_amd64
+      env:
+        type: LINUX_CONTAINER
+        compute-type: BUILD_GENERAL1_SMALL
+        variables:
+          IMAGE_PLATFORMS: linux/amd64
+          BINARY_PLATFORMS: linux/amd64
+          IMAGE_TAG_SUFFIX: -amd64
+    - identifier: tinkerbell_rufio_linux_arm64
+      env:
+        type: ARM_CONTAINER
+        compute-type: BUILD_GENERAL1_SMALL
+        variables:
+          IMAGE_PLATFORMS: linux/arm64
+          BINARY_PLATFORMS: linux/arm64
+          IMAGE_TAG_SUFFIX: -arm64
+    - identifier: tinkerbell_rufio
+      buildspec: buildspecs/combine-images.yml
+      env:
+        type: ARM_CONTAINER
+        compute-type: BUILD_GENERAL1_SMALL
+version: 0.2
+phases:
+  pre_build:
+    commands:
+      - ./build/lib/setup.sh
+  build:
+    commands:
+      - if $(make check-project-path-exists) && make check-for-release-branch-skip -C $PROJECT_PATH; then make release -C $PROJECT_PATH; fi
diff --git a/projects/tinkerbell/tinkerbell-chart/Makefile b/projects/tinkerbell/tinkerbell-chart/Makefile
index 144a5ba37f..09ff4fd4a8 100644
--- a/projects/tinkerbell/tinkerbell-chart/Makefile
+++ b/projects/tinkerbell/tinkerbell-chart/Makefile
@@ -15,6 +15,7 @@ HELM_SOURCE_REPOSITORY=.
 HELM_IMAGE_LIST=
 HELM_CHART_NAMES=$(REPO_OWNER)/$(REPO)
 
+EXCLUDE_FROM_STAGING_BUILDSPEC=true
 EXCLUDE_FROM_UPGRADE_BUILDSPEC=true
 
 include $(BASE_DIRECTORY)/Common.mk
diff --git a/release/staging-build.yml b/release/staging-build.yml
index b3b6972a65..21731a99f4 100644
--- a/release/staging-build.yml
+++ b/release/staging-build.yml
@@ -69,13 +69,6 @@ batch:
         variables:
           PROJECT_PATH: projects/aws/bottlerocket-bootstrap
           RELEASE_BRANCH: 1-31
-    - identifier: aws_cluster_api_provider_aws_snow
-      env:
-        type: ARM_CONTAINER
-        compute-type: BUILD_GENERAL1_SMALL
-        variables:
-          PROJECT_PATH: projects/aws/cluster-api-provider-aws-snow
-          CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/aws.cluster-api-provider-aws-snow
     - identifier: aws_eks_anywhere
       env:
         type: ARM_CONTAINER
@@ -939,7 +932,28 @@ batch:
           PROJECT_PATH: projects/tinkerbell/ipxedust
           CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/tinkerbell.ipxedust
           BINARY_PLATFORMS: linux/arm64
+    - identifier: tinkerbell_rufio_linux_amd64
+      env:
+        type: LINUX_CONTAINER
+        compute-type: BUILD_GENERAL1_SMALL
+        variables:
+          PROJECT_PATH: projects/tinkerbell/rufio
+          CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/tinkerbell.rufio
+          IMAGE_PLATFORMS: linux/amd64
+          BINARY_PLATFORMS: linux/amd64
+          IMAGE_TAG_SUFFIX: -amd64
+    - identifier: tinkerbell_rufio_linux_arm64
+      env:
+        type: ARM_CONTAINER
+        compute-type: BUILD_GENERAL1_SMALL
+        variables:
+          PROJECT_PATH: projects/tinkerbell/rufio
+          CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/tinkerbell.rufio
+          IMAGE_PLATFORMS: linux/arm64
+          BINARY_PLATFORMS: linux/arm64
+          IMAGE_TAG_SUFFIX: -arm64
     - identifier: tinkerbell_rufio
+      buildspec: buildspecs/combine-images.yml
       env:
         type: ARM_CONTAINER
         compute-type: BUILD_GENERAL1_SMALL
@@ -977,12 +991,6 @@ batch:
         variables:
           PROJECT_PATH: projects/tinkerbell/tink
           CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/tinkerbell.tink
-    - identifier: tinkerbell_tinkerbell_chart
-      env:
-        type: ARM_CONTAINER
-        compute-type: BUILD_GENERAL1_SMALL
-        variables:
-          PROJECT_PATH: projects/tinkerbell/tinkerbell-chart
     - identifier: tinkerbell_tinkerbell_crds
       env:
         type: ARM_CONTAINER
diff --git a/tools/version-tracker/buildspecs/upgrade.yml b/tools/version-tracker/buildspecs/upgrade.yml
index 74f4af6c7f..952954f0f2 100644
--- a/tools/version-tracker/buildspecs/upgrade.yml
+++ b/tools/version-tracker/buildspecs/upgrade.yml
@@ -445,13 +445,26 @@ batch:
           IMAGE_PLATFORMS: linux/arm64
           BINARY_PLATFORMS: linux/arm64
           IMAGE_TAG_SUFFIX: -arm64
-    - identifier: tinkerbell_rufio
+    - identifier: tinkerbell_rufio_linux_amd64
+      env:
+        type: LINUX_CONTAINER
+        compute-type: BUILD_GENERAL1_SMALL
+        variables:
+          PROJECT_PATH: projects/tinkerbell/rufio
+          CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/tinkerbell.rufio
+          IMAGE_PLATFORMS: linux/amd64
+          BINARY_PLATFORMS: linux/amd64
+          IMAGE_TAG_SUFFIX: -amd64
+    - identifier: tinkerbell_rufio_linux_arm64
       env:
         type: ARM_CONTAINER
         compute-type: BUILD_GENERAL1_SMALL
         variables:
           PROJECT_PATH: projects/tinkerbell/rufio
           CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/tinkerbell.rufio
+          IMAGE_PLATFORMS: linux/arm64
+          BINARY_PLATFORMS: linux/arm64
+          IMAGE_TAG_SUFFIX: -arm64
     - identifier: tinkerbell_tink_linux_amd64
       env:
         type: LINUX_CONTAINER