diff --git a/tekton/common/task-buildah-build.yaml b/tekton/common/task-buildah-build.yaml
index fa22d68..05802d3 100644
--- a/tekton/common/task-buildah-build.yaml
+++ b/tekton/common/task-buildah-build.yaml
@@ -94,11 +94,11 @@ spec:
       BUILDAH_OPTS+=( "-f" "$(workspaces.source-workspace.path)/$(params.containerfile-path)" )
       BUILDAH_OPTS+=( "--no-cache" )
       BUILDAH_OPTS+=( "-t" "localhost/image:$(uname -m)" )
-      BUILDAH_OPTS+=( "$(workspaces.source-workspace.path)/$(params.context-dir)" )
       if [ -n "${OVERRIDE_FROM:-}" ]; then
         echo "Overriding FROM instruction with: $OVERRIDE_FROM"
         BUILDAH_OPTS+=( "--from" "$OVERRIDE_FROM" )
       fi
+      BUILDAH_OPTS+=( "$(workspaces.source-workspace.path)/$(params.context-dir)" )
       buildah build "${BUILDAH_OPTS[@]}"
 
       echo "=== Export as tar archive ==="