diff --git a/components/konflux-ui/staging/base/proxy/proxy.yaml b/components/konflux-ui/staging/base/proxy/proxy.yaml
index e547c64a78a..ce5eb1cb54d 100644
--- a/components/konflux-ui/staging/base/proxy/proxy.yaml
+++ b/components/konflux-ui/staging/base/proxy/proxy.yaml
@@ -161,23 +161,6 @@ spec:
           readOnlyRootFilesystem: true
           runAsNonRoot: true
           runAsUser: 1001
-      - image: quay.io/konflux-ci/workspace-manager@sha256:48df30520a766101473e80e7a4abbf59ce06097a5f5919e15075afaa86bd1a2d
-        name: workspace-manager
-        ports:
-          - containerPort: 5000
-            name: web
-            protocol: TCP
-        resources:
-          limits:
-            cpu: 300m
-            memory: 256Mi
-          requests:
-            cpu: 30m
-            memory: 128Mi
-        securityContext:
-          readOnlyRootFilesystem: true
-          runAsNonRoot: true
-          runAsUser: 1001
       - image: quay.io/oauth2-proxy/oauth2-proxy@sha256:3da33b9670c67bd782277f99acadf7026f75b9507bfba2088eb2d497266ef7fc
         name: oauth2-proxy
         env:
diff --git a/components/konflux-ui/staging/stone-stage-p01/oauth2-proxy-args-patch.yaml b/components/konflux-ui/staging/stone-stage-p01/oauth2-proxy-args-patch.yaml
index 0c20a89bbf6..a9ff2a781cb 100644
--- a/components/konflux-ui/staging/stone-stage-p01/oauth2-proxy-args-patch.yaml
+++ b/components/konflux-ui/staging/stone-stage-p01/oauth2-proxy-args-patch.yaml
@@ -1,6 +1,6 @@
 ---
 - op: replace
-  path: /spec/template/spec/containers/2/args
+  path: /spec/template/spec/containers/1/args
   value:
     - --provider
     - oidc
diff --git a/components/konflux-ui/staging/stone-stage-p01/remove-run-as-user-proxy-patch.yaml b/components/konflux-ui/staging/stone-stage-p01/remove-run-as-user-proxy-patch.yaml
index a8939cefd33..d6a1ab805fd 100644
--- a/components/konflux-ui/staging/stone-stage-p01/remove-run-as-user-proxy-patch.yaml
+++ b/components/konflux-ui/staging/stone-stage-p01/remove-run-as-user-proxy-patch.yaml
@@ -10,6 +10,3 @@
 
 - op: remove
   path: /spec/template/spec/containers/1/securityContext/runAsUser
-
-- op: remove
-  path: /spec/template/spec/containers/2/securityContext/runAsUser
diff --git a/components/konflux-ui/staging/stone-stg-rh01/oauth2-proxy-args-patch.yaml b/components/konflux-ui/staging/stone-stg-rh01/oauth2-proxy-args-patch.yaml
index 27f5373965e..2bd7b502e9a 100644
--- a/components/konflux-ui/staging/stone-stg-rh01/oauth2-proxy-args-patch.yaml
+++ b/components/konflux-ui/staging/stone-stg-rh01/oauth2-proxy-args-patch.yaml
@@ -1,6 +1,6 @@
 ---
 - op: replace
-  path: /spec/template/spec/containers/2/args
+  path: /spec/template/spec/containers/1/args
   value:
     - --provider
     - oidc
diff --git a/components/konflux-ui/staging/stone-stg-rh01/remove-run-as-user-proxy-patch.yaml b/components/konflux-ui/staging/stone-stg-rh01/remove-run-as-user-proxy-patch.yaml
index a8939cefd33..d6a1ab805fd 100644
--- a/components/konflux-ui/staging/stone-stg-rh01/remove-run-as-user-proxy-patch.yaml
+++ b/components/konflux-ui/staging/stone-stg-rh01/remove-run-as-user-proxy-patch.yaml
@@ -10,6 +10,3 @@
 
 - op: remove
   path: /spec/template/spec/containers/1/securityContext/runAsUser
-
-- op: remove
-  path: /spec/template/spec/containers/2/securityContext/runAsUser