diff --git a/konflux-configs/base/project/overlay/cli-stacks/patch/cosign-cli-stack.yaml b/konflux-configs/base/project/overlay/cli-stacks/patch/cosign-cli-stack.yaml
index e2720688..b47d52fa 100644
--- a/konflux-configs/base/project/overlay/cli-stacks/patch/cosign-cli-stack.yaml
+++ b/konflux-configs/base/project/overlay/cli-stacks/patch/cosign-cli-stack.yaml
@@ -13,6 +13,8 @@
     spec:
       application: "{{.application}}{{.nameSuffix}}"
       componentName: "cosign-cli-stack"
+      build-nudges-ref:
+        - "client-server{{.nameSuffix}}"
       source:
         git:
           url: https://github.com/securesign/cosign
diff --git a/konflux-configs/base/project/overlay/cli-stacks/patch/fetch-tsa-certs-cli-stack.yaml b/konflux-configs/base/project/overlay/cli-stacks/patch/fetch-tsa-certs-cli-stack.yaml
index 41fdaba9..6a819153 100644
--- a/konflux-configs/base/project/overlay/cli-stacks/patch/fetch-tsa-certs-cli-stack.yaml
+++ b/konflux-configs/base/project/overlay/cli-stacks/patch/fetch-tsa-certs-cli-stack.yaml
@@ -13,6 +13,8 @@
     spec:
       application: "{{.application}}{{.nameSuffix}}"
       componentName: "fetch-tsa-certs-cli-stack"
+      build-nudges-ref:
+        - "client-server{{.nameSuffix}}"
       source:
         git:
           url: https://github.com/securesign/timestamp-authority
diff --git a/konflux-configs/base/project/overlay/cli-stacks/patch/gitsign-cli-stack.yaml b/konflux-configs/base/project/overlay/cli-stacks/patch/gitsign-cli-stack.yaml
index 1e5e490d..06874c06 100644
--- a/konflux-configs/base/project/overlay/cli-stacks/patch/gitsign-cli-stack.yaml
+++ b/konflux-configs/base/project/overlay/cli-stacks/patch/gitsign-cli-stack.yaml
@@ -13,6 +13,8 @@
     spec:
       application: "{{.application}}{{.nameSuffix}}"
       componentName: "gitsign-cli-stack"
+      build-nudges-ref:
+        - "client-server{{.nameSuffix}}"
       source:
         git:
           url: https://github.com/securesign/gitsign
diff --git a/konflux-configs/base/project/overlay/cli-stacks/patch/rekor-cli-stack.yaml b/konflux-configs/base/project/overlay/cli-stacks/patch/rekor-cli-stack.yaml
index cc9c07a8..eda59f82 100644
--- a/konflux-configs/base/project/overlay/cli-stacks/patch/rekor-cli-stack.yaml
+++ b/konflux-configs/base/project/overlay/cli-stacks/patch/rekor-cli-stack.yaml
@@ -13,6 +13,8 @@
     spec:
       application: "{{.application}}{{.nameSuffix}}"
       componentName: "rekor-cli-stack"
+      build-nudges-ref:
+        - "client-server{{.nameSuffix}}"
       source:
         git:
           url: https://github.com/securesign/rekor
diff --git a/konflux-configs/base/project/overlay/cli-stacks/patch/trillian-cli-stack.yaml b/konflux-configs/base/project/overlay/cli-stacks/patch/trillian-cli-stack.yaml
index 82140365..95700909 100644
--- a/konflux-configs/base/project/overlay/cli-stacks/patch/trillian-cli-stack.yaml
+++ b/konflux-configs/base/project/overlay/cli-stacks/patch/trillian-cli-stack.yaml
@@ -13,6 +13,8 @@
     spec:
       application: "{{.application}}{{.nameSuffix}}"
       componentName: "trillian-cli-stack"
+      build-nudges-ref:
+        - "client-server{{.nameSuffix}}"
       source:
         git:
           url: https://github.com/securesign/trillian
diff --git a/konflux-configs/base/project/overlay/cli-stacks/patch/tuftool-cli-stack.yaml b/konflux-configs/base/project/overlay/cli-stacks/patch/tuftool-cli-stack.yaml
index d99d96be..8ead452b 100644
--- a/konflux-configs/base/project/overlay/cli-stacks/patch/tuftool-cli-stack.yaml
+++ b/konflux-configs/base/project/overlay/cli-stacks/patch/tuftool-cli-stack.yaml
@@ -13,6 +13,8 @@
     spec:
       application: "{{.application}}{{.nameSuffix}}"
       componentName: "tuftool-cli-stack"
+      build-nudges-ref:
+        - "client-server{{.nameSuffix}}"
       source:
         git:
           url: https://github.com/securesign/tough
diff --git a/konflux-configs/base/project/overlay/create-tree/patch/create-tree.yaml b/konflux-configs/base/project/overlay/create-tree/patch/create-tree.yaml
index 17f453e0..1ab760e9 100644
--- a/konflux-configs/base/project/overlay/create-tree/patch/create-tree.yaml
+++ b/konflux-configs/base/project/overlay/create-tree/patch/create-tree.yaml
@@ -16,7 +16,6 @@
       build-nudges-ref:
         - "artifact-signer-ansible{{.nameSuffix}}"
         - "rhtas-operator{{.nameSuffix}}"
-        - "client-server{{.nameSuffix}}"
         - "trillian-cli-stack{{.nameSuffix}}"
       source:
         git:
diff --git a/konflux-configs/base/project/overlay/tas-tools/patch/cosign.yaml b/konflux-configs/base/project/overlay/tas-tools/patch/cosign.yaml
index 4d6f5554..37e72e4c 100644
--- a/konflux-configs/base/project/overlay/tas-tools/patch/cosign.yaml
+++ b/konflux-configs/base/project/overlay/tas-tools/patch/cosign.yaml
@@ -14,7 +14,6 @@
       application: "{{.application}}{{.nameSuffix}}"
       componentName: "cosign"
       build-nudges-ref:
-        - "client-server{{.nameSuffix}}"
         - "cosign-cli-stack{{.nameSuffix}}"
       source:
         git:
diff --git a/konflux-configs/base/project/overlay/tas-tools/patch/fetch-tsa.yaml b/konflux-configs/base/project/overlay/tas-tools/patch/fetch-tsa.yaml
index 67108f68..7be97152 100644
--- a/konflux-configs/base/project/overlay/tas-tools/patch/fetch-tsa.yaml
+++ b/konflux-configs/base/project/overlay/tas-tools/patch/fetch-tsa.yaml
@@ -14,7 +14,6 @@
       application: "{{.application}}{{.nameSuffix}}"
       componentName: "fetch-tsa-certs"
       build-nudges-ref:
-        - "client-server{{.nameSuffix}}"
         - "fetch-tsa-certs-cli-stack{{.nameSuffix}}"
       source:
         git:
diff --git a/konflux-configs/base/project/overlay/tas-tools/patch/gitsign.yaml b/konflux-configs/base/project/overlay/tas-tools/patch/gitsign.yaml
index c5df2d2c..e875b416 100644
--- a/konflux-configs/base/project/overlay/tas-tools/patch/gitsign.yaml
+++ b/konflux-configs/base/project/overlay/tas-tools/patch/gitsign.yaml
@@ -14,7 +14,6 @@
       application: "{{.application}}{{.nameSuffix}}"
       componentName: "gitsign"
       build-nudges-ref:
-        - "client-server{{.nameSuffix}}"
         - "gitsign-cli-stack{{.nameSuffix}}"
       source:
         git:
diff --git a/konflux-configs/base/project/overlay/tas-tools/patch/rekor-cli.yaml b/konflux-configs/base/project/overlay/tas-tools/patch/rekor-cli.yaml
index 4b41a452..a3eb5db6 100644
--- a/konflux-configs/base/project/overlay/tas-tools/patch/rekor-cli.yaml
+++ b/konflux-configs/base/project/overlay/tas-tools/patch/rekor-cli.yaml
@@ -14,7 +14,6 @@
       application: "{{.application}}{{.nameSuffix}}"
       componentName: "rekor-cli"
       build-nudges-ref:
-        - "client-server{{.nameSuffix}}"
         - "rekor-cli-stack{{.nameSuffix}}"
       source:
         git:
diff --git a/konflux-configs/base/project/overlay/tas-tools/patch/update-tree.yaml b/konflux-configs/base/project/overlay/tas-tools/patch/update-tree.yaml
index 0ae0a3b3..c590abd6 100644
--- a/konflux-configs/base/project/overlay/tas-tools/patch/update-tree.yaml
+++ b/konflux-configs/base/project/overlay/tas-tools/patch/update-tree.yaml
@@ -14,7 +14,6 @@
       application: "{{.application}}{{.nameSuffix}}"
       componentName: "updatetree"
       build-nudges-ref:
-        - "client-server{{.nameSuffix}}"
         - "trillian-cli-stack{{.nameSuffix}}"
       source:
         git:
diff --git a/konflux-configs/base/project/overlay/tough/patch/tuf-tool.yaml b/konflux-configs/base/project/overlay/tough/patch/tuf-tool.yaml
index 833349d0..df2ddf54 100644
--- a/konflux-configs/base/project/overlay/tough/patch/tuf-tool.yaml
+++ b/konflux-configs/base/project/overlay/tough/patch/tuf-tool.yaml
@@ -14,7 +14,6 @@
       application: "{{.application}}{{.nameSuffix}}"
       componentName: "tuf-tool"
       build-nudges-ref:
-        - "client-server{{.nameSuffix}}"
         - "tuftool-cli-stack{{.nameSuffix}}"
       source:
         git: