diff --git a/release/release.sh b/release/release.sh
index ff588c3ca..c1e83262a 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -14,4 +14,4 @@ sed -i "s/devel$/${RELEASE_VERSION}/g" ${RELEASE_DIR}/kustomization.yaml
 sed -i "s/devel$/${RELEASE_VERSION}/g" ${ROOT}/config/base/config-info.yaml  
 
 # Apply kustomiation + build images + generate yaml
-kubectl kustomize ${RELEASE_DIR} | ko resolve --platform "linux/amd64,linux/ppc64le,linux/s390x" -P -f - -t ${RELEASE_VERSION} > ${RELEASE_DIR}/release.yaml
+kubectl kustomize ${RELEASE_DIR} | ko resolve --platform "linux/amd64,linux/arm,linux/arm64,linux/ppc64le,linux/s390x" -P -f - -t ${RELEASE_VERSION} > ${RELEASE_DIR}/release.yaml
diff --git a/tekton/ci.yaml b/tekton/ci.yaml
index bba6ca5e3..4777ba88a 100644
--- a/tekton/ci.yaml
+++ b/tekton/ci.yaml
@@ -52,45 +52,41 @@ spec:
       workspaces:
         - name: source
           workspace: ws
-    - name: unit-tests-ppc64le
+    - name: build
       runAfter: [checkout]
       taskRef:
-        name: golang-test
+        name: golang-build
       params:
         - name: package
           value: $(params.package)
-        - name: GOARCH
-          value: ppc64le
-        - name: flags
-          value: "-cover -v"
       workspaces:
         - name: source
           workspace: ws
-    - name: unit-tests-s390x
+    - name: build-ppc64le
       runAfter: [checkout]
       taskRef:
-        name: golang-test
+        name: golang-build
       params:
         - name: package
           value: $(params.package)
         - name: GOARCH
-          value: s390x
-        - name: flags
-          value: "-cover -v"
+          value: ppc64le
       workspaces:
         - name: source
           workspace: ws
-    - name: build
+    - name: build-s390x
       runAfter: [checkout]
       taskRef:
         name: golang-build
       params:
         - name: package
           value: $(params.package)
+        - name: GOARCH
+          value: s390x
       workspaces:
         - name: source
           workspace: ws
-    - name: build-ppc64le
+    - name: build-arm64
       runAfter: [checkout]
       taskRef:
         name: golang-build
@@ -98,11 +94,11 @@ spec:
         - name: package
           value: $(params.package)
         - name: GOARCH
-          value: ppc64le
+          value: arm64
       workspaces:
         - name: source
           workspace: ws
-    - name: build-s390x
+    - name: build-arm
       runAfter: [checkout]
       taskRef:
         name: golang-build
@@ -110,7 +106,7 @@ spec:
         - name: package
           value: $(params.package)
         - name: GOARCH
-          value: s390x
+          value: arm
       workspaces:
         - name: source
           workspace: ws