diff --git a/.tekton/argocd-pull-request.yaml b/.tekton/argocd-pull-request.yaml
index ebe7ad847..52f2b1df7 100644
--- a/.tekton/argocd-pull-request.yaml
+++ b/.tekton/argocd-pull-request.yaml
@@ -59,8 +59,11 @@ spec:
     - linux/x86_64
   - name: dockerfile
     value: containers/argocd/Dockerfile
+  # Hermeto does not support pnpm prefetch yet; UI deps are installed during the image build.
+  - name: hermetic
+    value: "false"
   - name: prefetch-input
-    value: '[{"type":"gomod","path":"./sources/argo-cd"}, {"type":"yarn","path":"./sources/argo-cd/ui"}, {"type":"gomod","path":"./sources/kustomize/kustomize"}, {"type":"gomod","path":"./sources/helm"}, {"type":"gomod","path":"./sources/git-lfs"}, {"type":"rpm","path":"prefetch/rpms/ubi9"}, {"type":"npm","path":"prefetch/yarn"}]'
+    value: '[{"type":"gomod","path":"./sources/argo-cd"}, {"type":"gomod","path":"./sources/kustomize/kustomize"}, {"type":"gomod","path":"./sources/helm"}, {"type":"gomod","path":"./sources/git-lfs"}, {"type":"rpm","path":"prefetch/rpms/ubi9"}]'
   - name: git-metadata-directories
     value:
       - sources/argo-cd
diff --git a/.tekton/argocd-push.yaml b/.tekton/argocd-push.yaml
index 5e4096d00..cf9e1e4a4 100644
--- a/.tekton/argocd-push.yaml
+++ b/.tekton/argocd-push.yaml
@@ -57,8 +57,11 @@ spec:
       - '{{target_branch}}'
   - name: dockerfile
     value: containers/argocd/Dockerfile
+  # Hermeto does not support pnpm prefetch yet; UI deps are installed during the image build.
+  - name: hermetic
+    value: "false"
   - name: prefetch-input
-    value: '[{"type":"gomod","path":"./sources/argo-cd"}, {"type":"yarn","path":"./sources/argo-cd/ui"}, {"type":"gomod","path":"./sources/kustomize/kustomize"}, {"type":"gomod","path":"./sources/helm"}, {"type":"gomod","path":"./sources/git-lfs"}, {"type":"rpm","path":"prefetch/rpms/ubi9"}, {"type":"npm","path":"prefetch/yarn"}]'
+    value: '[{"type":"gomod","path":"./sources/argo-cd"}, {"type":"gomod","path":"./sources/kustomize/kustomize"}, {"type":"gomod","path":"./sources/helm"}, {"type":"gomod","path":"./sources/git-lfs"}, {"type":"rpm","path":"prefetch/rpms/ubi9"}]'
   - name: git-metadata-directories
     value:
       - sources/argo-cd
diff --git a/config.yaml b/config.yaml
index 46937209d..4611fe343 100644
--- a/config.yaml
+++ b/config.yaml
@@ -29,8 +29,8 @@ sources:
     commit: fee011bc839911e119c8d774e97308222b4dfa8f
   - path: sources/argo-cd 
     url: https://github.com/argoproj/argo-cd.git
-    ref: v3.4.2
-    commit: 0dc6b1b57dd5bb925d5b03c3d09419ab9fb4225e
+    ref: master
+    commit: f5f3bf8a064956efd13eb02cc6702319ab564ed6
   - path: sources/argo-rollouts 
     url: https://github.com/argoproj/argo-rollouts.git
     ref: v1.8.3
diff --git a/containers/argocd/Dockerfile b/containers/argocd/Dockerfile
index 43c6cbcd4..15e0299de 100644
--- a/containers/argocd/Dockerfile
+++ b/containers/argocd/Dockerfile
@@ -21,25 +21,20 @@ FROM registry.access.redhat.com/ubi9/nodejs-22 AS argocd-ui
 
 USER root
 
-# Install Yarn
-WORKDIR /usr/src/app
-COPY ["prefetch/yarn/package.json", "prefetch/yarn/package-lock.json", "./"]
-RUN npm install --prefer-offline --no-progress --non-interactive
-ENV YARN="/usr/src/app/node_modules/.bin/yarn"
-RUN $YARN --version
-
 WORKDIR /usr/src/app/argo-cd/ui
 
-COPY ["sources/argo-cd/ui/package.json", "sources/argo-cd/ui/yarn.lock", "./"]
+COPY ["sources/argo-cd/ui/package.json", "sources/argo-cd/ui/pnpm-lock.yaml", "./"]
 
-RUN $YARN  install --no-progress --non-interactive --prefer-offline --network-timeout 200000 && \
-    $YARN cache clean
+RUN npm install -g corepack@0.34.6 && \
+    corepack enable && \
+    pnpm install --frozen-lockfile
 
 COPY ["sources/argo-cd/ui/", "."]
 
 ARG ARGO_VERSION=latest
 ENV ARGO_VERSION=$ARGO_VERSION
-RUN NODE_ONLINE_ENV='offline' NODE_ENV='production' $YARN build
+ARG TARGETARCH
+RUN HOST_ARCH=${TARGETARCH:-amd64} NODE_ENV='production' NODE_ONLINE_ENV='offline' NODE_OPTIONS=--max_old_space_size=8192 pnpm build
 
 ####################################################################################################
 # Argo CD Build stage which performs the actual build of Argo CD binaries
diff --git a/sources/argo-cd b/sources/argo-cd
index 0dc6b1b57..f5f3bf8a0 160000
--- a/sources/argo-cd
+++ b/sources/argo-cd
@@ -1 +1 @@
-Subproject commit 0dc6b1b57dd5bb925d5b03c3d09419ab9fb4225e
+Subproject commit f5f3bf8a064956efd13eb02cc6702319ab564ed6