diff --git a/.github/workflows/build_aws_scheduled.yml b/.github/workflows/build_aws_scheduled.yml
index 9f8620d..414e02a 100644
--- a/.github/workflows/build_aws_scheduled.yml
+++ b/.github/workflows/build_aws_scheduled.yml
@@ -55,6 +55,13 @@ jobs:
             PKR_VAR_source_ami_architecture: ${{ matrix.arch }}
             PKR_VAR_instance_type: ${{ matrix.arch == 'x86_64' && 't3.micro' || 't4g.micro' }}
 
+      - name: Upload manifest
+        uses: actions/upload-artifact@v3
+        with:
+          path: manifest_aws_${{ matrix.arch }}.json
+          name: manifest_aws_${{ matrix.arch }}.json
+          retention-days: 5
+
   build-govcloud:
     # Since we run in parallel, let's make sure we use the same timestamp for all jobs
     needs: timestamp
@@ -95,10 +102,3 @@ jobs:
           PKR_VAR_ami_name_prefix: spacelift-${{ needs.timestamp.outputs.timestamp }}
           PKR_VAR_source_ami_architecture: ${{ matrix.arch }}
           PKR_VAR_instance_type: ${{ matrix.arch == 'x86_64' && 't3.micro' || 't4g.micro' }}
-
-      - name: Upload manifest
-        uses: actions/upload-artifact@v3
-        with:
-          path: manifest_aws.json
-          name: manifest_aws.json
-          retention-days: 5
diff --git a/aws.pkr.hcl b/aws.pkr.hcl
index b006444..81d2608 100644
--- a/aws.pkr.hcl
+++ b/aws.pkr.hcl
@@ -161,6 +161,6 @@ build {
   }
 
   post-processor "manifest" {
-    output = "manifest_aws.json"
+    output = "manifest_aws_${var.source_ami_architecture}.json"
   }
 }