diff --git a/.tekton/source-to-image-pull-request.yaml b/.tekton/source-to-image-pull-request.yaml
index 87e456bba..30bb3d011 100644
--- a/.tekton/source-to-image-pull-request.yaml
+++ b/.tekton/source-to-image-pull-request.yaml
@@ -108,6 +108,8 @@ spec:
     - default:
       - linux/x86_64
       - linux/arm64
+      - linux/ppc64le
+      - linux/s390x
       description: List of platforms to build the container images on. The available
         set of values is determined by the configuration of the multi-platform-controller.
       name: build-platforms
diff --git a/.tekton/source-to-image-push.yaml b/.tekton/source-to-image-push.yaml
index a15a7c5d4..3e87405c4 100644
--- a/.tekton/source-to-image-push.yaml
+++ b/.tekton/source-to-image-push.yaml
@@ -105,6 +105,8 @@ spec:
     - default:
       - linux/x86_64
       - linux/arm64
+      - linux/ppc64le
+      - linux/s390x
       description: List of platforms to build the container images on. The available
         set of values is determined by the configuration of the multi-platform-controller.
       name: build-platforms
diff --git a/Dockerfile b/Dockerfile
index a0bc03308..ff8c07626 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ENV S2I_GIT_VERSION="1.4.0" \
 
 COPY . .
 
-RUN CGO_ENABLED=0 go build -a -ldflags="-s -w" -o /tmp/s2i ./cmd/s2i
+RUN CGO_ENABLED=0 GO111MODULE=on go build -a -mod=vendor -ldflags="-s -w" -o /tmp/s2i ./cmd/s2i
 
 #
 # Runner Image
@@ -25,7 +25,6 @@ LABEL \
     description="Source-to-Image is a builder image" \
     summary="Source-to-Image is a builder image" \
     version="1.4.0" \
-    architecture="${GOARCH}" \
     vendor="Red Hat, Inc." \
     com.redhat.component="source-to-image-container" \
     maintainer="openshift-builds@redhat.com" \