From fe5801f8a91968e66fb5bb4c1906e900f77cef27 Mon Sep 17 00:00:00 2001
From: justinsb <justinsb@google.com>
Date: Sat, 1 Jul 2023 08:27:38 -0400
Subject: [PATCH] Update expected output for symlinks

---
 .../etcdmanager/tests/interval/tasks.yaml     | 148 +++---------------
 .../etcdmanager/tests/minimal/tasks.yaml      | 148 +++---------------
 .../tests/overwrite_settings/tasks.yaml       | 148 +++---------------
 .../etcdmanager/tests/proxy/tasks.yaml        | 148 +++---------------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1b_content |  74 ++-------
 ...cdmanager-events-master-us-test-1c_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1b_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1c_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1b_content |  74 ++-------
 ...cdmanager-events-master-us-test-1c_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1b_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1c_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1b_content |  74 ++-------
 ...cdmanager-events-master-us-test-1c_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1b_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1c_content |  74 ++-------
 ...cdmanager-events-master-us-test1-a_content |  74 ++-------
 ...cdmanager-events-master-us-test1-b_content |  74 ++-------
 ...cdmanager-events-master-us-test1-c_content |  74 ++-------
 ...etcdmanager-main-master-us-test1-a_content |  74 ++-------
 ...etcdmanager-main-master-us-test1-b_content |  74 ++-------
 ...etcdmanager-main-master-us-test1-c_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test1-a_content |  74 ++-------
 ...etcdmanager-main-master-us-test1-a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test1-a_content |  74 ++-------
 ...etcdmanager-main-master-us-test1-a_content |  74 ++-------
 ...cdmanager-events-master-us-test1-a_content |  74 ++-------
 ...etcdmanager-main-master-us-test1-a_content |  74 ++-------
 ...cdmanager-events-master-us-test1-a_content |  74 ++-------
 ...etcdmanager-main-master-us-test1-a_content |  74 ++-------
 ...cdmanager-events-master-us-test1-a_content |  74 ++-------
 ...etcdmanager-main-master-us-test1-a_content |  74 ++-------
 ...cdmanager-events-master-us-test1-a_content |  74 ++-------
 ...etcdmanager-main-master-us-test1-a_content |  74 ++-------
 ...cdmanager-events-master-us-test1-a_content |  74 ++-------
 ...etcdmanager-main-master-us-test1-a_content |  74 ++-------
 ...cdmanager-events-master-us-test1-a_content |  74 ++-------
 ...etcdmanager-main-master-us-test1-a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...sts-etcdmanager-events-master-fsn1_content |  74 ++-------
 ...fests-etcdmanager-main-master-fsn1_content |  74 ++-------
 ...ager-events-control-plane-fr-par-1_content |  74 ++-------
 ...anager-main-control-plane-fr-par-1_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1b_content |  74 ++-------
 ...cdmanager-events-master-us-test-1c_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1b_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1c_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1b_content |  74 ++-------
 ...cdmanager-events-master-us-test-1c_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1b_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1c_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-cilium-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 ...cdmanager-events-master-us-test-1a_content |  74 ++-------
 ...etcdmanager-main-master-us-test-1a_content |  74 ++-------
 187 files changed, 1910 insertions(+), 12224 deletions(-)

diff --git a/pkg/model/components/etcdmanager/tests/interval/tasks.yaml b/pkg/model/components/etcdmanager/tests/interval/tasks.yaml
index af207dab23f62..0535f67d4ecef 100644
--- a/pkg/model/components/etcdmanager/tests/interval/tasks.yaml
+++ b/pkg/model/components/etcdmanager/tests/interval/tasks.yaml
@@ -187,91 +187,37 @@ Contents: |
         name: opt
     - args:
       - -t
-      - /opt/etcd-v3.5.0
+      - /opt/etcd-v3.5.9
       - /usr/local/bin/etcd
       - /usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.0-0
-      name: init-etcd-3-5-0
+      image: registry.k8s.io/etcd:3.5.9-0
+      name: init-etcd-3-5-9
       resources: {}
       volumeMounts:
       - mountPath: /opt
         name: opt
     - args:
+      - -s
+      - /opt/etcd-v3.5.9/etcd
+      - /opt/etcd-v3.5.9/etcdctl
+      - -t
+      - /opt/etcd-v3.5.0
       - -t
       - /opt/etcd-v3.5.1
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.1-0
-      name: init-etcd-3-5-1
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.3
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.3-0
-      name: init-etcd-3-5-3
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.4
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.4-0
-      name: init-etcd-3-5-4
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.6
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.6-0
-      name: init-etcd-3-5-6
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.7
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.7-0
-      name: init-etcd-3-5-7
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
-      - -t
-      - /opt/etcd-v3.5.9
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.9-0
-      name: init-etcd-3-5-9
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+      name: init-etcd-symlinks-3-5-9
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -429,91 +375,37 @@ Contents: |
         name: opt
     - args:
       - -t
-      - /opt/etcd-v3.5.0
+      - /opt/etcd-v3.5.9
       - /usr/local/bin/etcd
       - /usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.0-0
-      name: init-etcd-3-5-0
+      image: registry.k8s.io/etcd:3.5.9-0
+      name: init-etcd-3-5-9
       resources: {}
       volumeMounts:
       - mountPath: /opt
         name: opt
     - args:
+      - -s
+      - /opt/etcd-v3.5.9/etcd
+      - /opt/etcd-v3.5.9/etcdctl
+      - -t
+      - /opt/etcd-v3.5.0
       - -t
       - /opt/etcd-v3.5.1
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.1-0
-      name: init-etcd-3-5-1
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.3
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.3-0
-      name: init-etcd-3-5-3
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.4
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.4-0
-      name: init-etcd-3-5-4
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.6
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.6-0
-      name: init-etcd-3-5-6
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.7
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.7-0
-      name: init-etcd-3-5-7
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
-      - -t
-      - /opt/etcd-v3.5.9
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.9-0
-      name: init-etcd-3-5-9
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+      name: init-etcd-symlinks-3-5-9
       resources: {}
       volumeMounts:
       - mountPath: /opt
diff --git a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml
index d407df045d1de..0fda0b027de97 100644
--- a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml
+++ b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml
@@ -186,91 +186,37 @@ Contents: |
         name: opt
     - args:
       - -t
-      - /opt/etcd-v3.5.0
+      - /opt/etcd-v3.5.9
       - /usr/local/bin/etcd
       - /usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.0-0
-      name: init-etcd-3-5-0
+      image: registry.k8s.io/etcd:3.5.9-0
+      name: init-etcd-3-5-9
       resources: {}
       volumeMounts:
       - mountPath: /opt
         name: opt
     - args:
+      - -s
+      - /opt/etcd-v3.5.9/etcd
+      - /opt/etcd-v3.5.9/etcdctl
+      - -t
+      - /opt/etcd-v3.5.0
       - -t
       - /opt/etcd-v3.5.1
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.1-0
-      name: init-etcd-3-5-1
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.3
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.3-0
-      name: init-etcd-3-5-3
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.4
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.4-0
-      name: init-etcd-3-5-4
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.6
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.6-0
-      name: init-etcd-3-5-6
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.7
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.7-0
-      name: init-etcd-3-5-7
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
-      - -t
-      - /opt/etcd-v3.5.9
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.9-0
-      name: init-etcd-3-5-9
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+      name: init-etcd-symlinks-3-5-9
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -427,91 +373,37 @@ Contents: |
         name: opt
     - args:
       - -t
-      - /opt/etcd-v3.5.0
+      - /opt/etcd-v3.5.9
       - /usr/local/bin/etcd
       - /usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.0-0
-      name: init-etcd-3-5-0
+      image: registry.k8s.io/etcd:3.5.9-0
+      name: init-etcd-3-5-9
       resources: {}
       volumeMounts:
       - mountPath: /opt
         name: opt
     - args:
+      - -s
+      - /opt/etcd-v3.5.9/etcd
+      - /opt/etcd-v3.5.9/etcdctl
+      - -t
+      - /opt/etcd-v3.5.0
       - -t
       - /opt/etcd-v3.5.1
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.1-0
-      name: init-etcd-3-5-1
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.3
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.3-0
-      name: init-etcd-3-5-3
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.4
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.4-0
-      name: init-etcd-3-5-4
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.6
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.6-0
-      name: init-etcd-3-5-6
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.7
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.7-0
-      name: init-etcd-3-5-7
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
-      - -t
-      - /opt/etcd-v3.5.9
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.9-0
-      name: init-etcd-3-5-9
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+      name: init-etcd-symlinks-3-5-9
       resources: {}
       volumeMounts:
       - mountPath: /opt
diff --git a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml
index 7ba48a5bcd5b1..792d4bdeb38fb 100644
--- a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml
+++ b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml
@@ -189,91 +189,37 @@ Contents: |
         name: opt
     - args:
       - -t
-      - /opt/etcd-v3.5.0
+      - /opt/etcd-v3.5.9
       - /usr/local/bin/etcd
       - /usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.0-0
-      name: init-etcd-3-5-0
+      image: registry.k8s.io/etcd:3.5.9-0
+      name: init-etcd-3-5-9
       resources: {}
       volumeMounts:
       - mountPath: /opt
         name: opt
     - args:
+      - -s
+      - /opt/etcd-v3.5.9/etcd
+      - /opt/etcd-v3.5.9/etcdctl
+      - -t
+      - /opt/etcd-v3.5.0
       - -t
       - /opt/etcd-v3.5.1
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.1-0
-      name: init-etcd-3-5-1
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.3
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.3-0
-      name: init-etcd-3-5-3
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.4
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.4-0
-      name: init-etcd-3-5-4
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.6
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.6-0
-      name: init-etcd-3-5-6
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.7
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.7-0
-      name: init-etcd-3-5-7
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
-      - -t
-      - /opt/etcd-v3.5.9
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.9-0
-      name: init-etcd-3-5-9
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+      name: init-etcd-symlinks-3-5-9
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -433,91 +379,37 @@ Contents: |
         name: opt
     - args:
       - -t
-      - /opt/etcd-v3.5.0
+      - /opt/etcd-v3.5.9
       - /usr/local/bin/etcd
       - /usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.0-0
-      name: init-etcd-3-5-0
+      image: registry.k8s.io/etcd:3.5.9-0
+      name: init-etcd-3-5-9
       resources: {}
       volumeMounts:
       - mountPath: /opt
         name: opt
     - args:
+      - -s
+      - /opt/etcd-v3.5.9/etcd
+      - /opt/etcd-v3.5.9/etcdctl
+      - -t
+      - /opt/etcd-v3.5.0
       - -t
       - /opt/etcd-v3.5.1
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.1-0
-      name: init-etcd-3-5-1
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.3
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.3-0
-      name: init-etcd-3-5-3
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.4
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.4-0
-      name: init-etcd-3-5-4
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.6
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.6-0
-      name: init-etcd-3-5-6
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.7
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.7-0
-      name: init-etcd-3-5-7
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
-      - -t
-      - /opt/etcd-v3.5.9
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.9-0
-      name: init-etcd-3-5-9
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+      name: init-etcd-symlinks-3-5-9
       resources: {}
       volumeMounts:
       - mountPath: /opt
diff --git a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml
index 28ddfea7d876c..7e0fb103579b1 100644
--- a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml
+++ b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml
@@ -195,91 +195,37 @@ Contents: |
         name: opt
     - args:
       - -t
-      - /opt/etcd-v3.5.0
+      - /opt/etcd-v3.5.9
       - /usr/local/bin/etcd
       - /usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.0-0
-      name: init-etcd-3-5-0
+      image: registry.k8s.io/etcd:3.5.9-0
+      name: init-etcd-3-5-9
       resources: {}
       volumeMounts:
       - mountPath: /opt
         name: opt
     - args:
+      - -s
+      - /opt/etcd-v3.5.9/etcd
+      - /opt/etcd-v3.5.9/etcdctl
+      - -t
+      - /opt/etcd-v3.5.0
       - -t
       - /opt/etcd-v3.5.1
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.1-0
-      name: init-etcd-3-5-1
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.3
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.3-0
-      name: init-etcd-3-5-3
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.4
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.4-0
-      name: init-etcd-3-5-4
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.6
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.6-0
-      name: init-etcd-3-5-6
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.7
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.7-0
-      name: init-etcd-3-5-7
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
-      - -t
-      - /opt/etcd-v3.5.9
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.9-0
-      name: init-etcd-3-5-9
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+      name: init-etcd-symlinks-3-5-9
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -445,91 +391,37 @@ Contents: |
         name: opt
     - args:
       - -t
-      - /opt/etcd-v3.5.0
+      - /opt/etcd-v3.5.9
       - /usr/local/bin/etcd
       - /usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.0-0
-      name: init-etcd-3-5-0
+      image: registry.k8s.io/etcd:3.5.9-0
+      name: init-etcd-3-5-9
       resources: {}
       volumeMounts:
       - mountPath: /opt
         name: opt
     - args:
+      - -s
+      - /opt/etcd-v3.5.9/etcd
+      - /opt/etcd-v3.5.9/etcdctl
+      - -t
+      - /opt/etcd-v3.5.0
       - -t
       - /opt/etcd-v3.5.1
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.1-0
-      name: init-etcd-3-5-1
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.3
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.3-0
-      name: init-etcd-3-5-3
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.4
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.4-0
-      name: init-etcd-3-5-4
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.6
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.6-0
-      name: init-etcd-3-5-6
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
       - -t
       - /opt/etcd-v3.5.7
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.7-0
-      name: init-etcd-3-5-7
-      resources: {}
-      volumeMounts:
-      - mountPath: /opt
-        name: opt
-    - args:
-      - -t
-      - /opt/etcd-v3.5.9
-      - /usr/local/bin/etcd
-      - /usr/local/bin/etcdctl
-      command:
-      - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.9-0
-      name: init-etcd-3-5-9
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+      name: init-etcd-symlinks-3-5-9
       resources: {}
       volumeMounts:
       - mountPath: /opt
diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 674b372321e39..3add8d0cd3606 100644
--- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index e43541a22992b..488c25799d275 100644
--- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index ff1401f3b33d9..87ac8ae1a3fb2 100644
--- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -125,91 +125,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 68ddc0c018746..0cb71e21aa278 100644
--- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -125,91 +125,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 0012dfecb39d4..f94220bb7519f 100644
--- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 4949d878577f6..c18dd6147cd6d 100644
--- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index b86efe696c217..729a8047e6923 100644
--- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 91c9e46f12ed4..9b2008eb0710b 100644
--- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index ed3da07f7b9a8..f537148eb2dbb 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index a4b9389acddb1..4318369d27c09 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 5a454effca995..691e43b818eb1 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 6c6fd6ace205a..7ed909a84bcd1 100644
--- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index a9bcfc42dfee9..0d23a7e21e56f 100644
--- a/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index c41b56f8d6c47..b99c4658a1638 100644
--- a/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 51d7edba16071..4649ec1a57049 100644
--- a/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 99818bc2b595b..fb9edac917074 100644
--- a/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index b9e71cee540d6..3ac07f1bd972a 100644
--- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index c9aff2a1a6754..873f76c4cc220 100644
--- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index b9e71cee540d6..3ac07f1bd972a 100644
--- a/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index c9aff2a1a6754..873f76c4cc220 100644
--- a/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index a718c35e6c0a2..2018d3b1e60c5 100644
--- a/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index e102194d84aac..4b6e04a9f8c91 100644
--- a/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index ffa45a7182a07..c69cad5d2b856 100644
--- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index a5ac397294d2a..cb8a8ad80bff2 100644
--- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index d46211c98caa8..bcf654ee18b51 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
index d46211c98caa8..bcf654ee18b51 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
index d46211c98caa8..bcf654ee18b51 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index bc1b835b72d46..0542810a3d9e1 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
index bc1b835b72d46..0542810a3d9e1 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
index bc1b835b72d46..0542810a3d9e1 100644
--- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
+++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 20e38afe41c2b..ee229358cfa91 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
index 20e38afe41c2b..ee229358cfa91 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
index 20e38afe41c2b..ee229358cfa91 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 8944cbd1c9704..ba35f484bfc2c 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
index 8944cbd1c9704..ba35f484bfc2c 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
index 8944cbd1c9704..ba35f484bfc2c 100644
--- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
+++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 0012dfecb39d4..f94220bb7519f 100644
--- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 4949d878577f6..c18dd6147cd6d 100644
--- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 0012dfecb39d4..f94220bb7519f 100644
--- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 4949d878577f6..c18dd6147cd6d 100644
--- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 1ed3d42f4ac6a..4dfacb15e87ac 100644
--- a/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 03bb5ffe308f8..7e0f84edc66d0 100644
--- a/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index fac22326d2cab..9cc4440968d03 100644
--- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 39d0944b9bea7..3a3e617389606 100644
--- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index d016ed1d6e56d..d0f14513edaf6 100644
--- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
index d016ed1d6e56d..d0f14513edaf6 100644
--- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
+++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
index d016ed1d6e56d..d0f14513edaf6 100644
--- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
+++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 57c33ed6faa4e..cf8a31f58ccf6 100644
--- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
index 57c33ed6faa4e..cf8a31f58ccf6 100644
--- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
+++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
index 57c33ed6faa4e..cf8a31f58ccf6 100644
--- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
+++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
index b7cd97674f912..4a6e256c2e9f1 100644
--- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
+++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-b_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-b_content
index b7cd97674f912..4a6e256c2e9f1 100644
--- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-b_content
+++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-b_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-c_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-c_content
index b7cd97674f912..4a6e256c2e9f1 100644
--- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-c_content
+++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-c_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
index 25f0108155657..461ce0f3a60c1 100644
--- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
+++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-b_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-b_content
index 25f0108155657..461ce0f3a60c1 100644
--- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-b_content
+++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-b_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-c_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-c_content
index 25f0108155657..461ce0f3a60c1 100644
--- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-c_content
+++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-c_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 0012dfecb39d4..f94220bb7519f 100644
--- a/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 4949d878577f6..c18dd6147cd6d 100644
--- a/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 0012dfecb39d4..f94220bb7519f 100644
--- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 4949d878577f6..c18dd6147cd6d 100644
--- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 0012dfecb39d4..f94220bb7519f 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 4949d878577f6..c18dd6147cd6d 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 0012dfecb39d4..f94220bb7519f 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 4949d878577f6..c18dd6147cd6d 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 0012dfecb39d4..f94220bb7519f 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 4949d878577f6..c18dd6147cd6d 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 0012dfecb39d4..f94220bb7519f 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 4949d878577f6..c18dd6147cd6d 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 0012dfecb39d4..f94220bb7519f 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 4949d878577f6..c18dd6147cd6d 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 0012dfecb39d4..f94220bb7519f 100644
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 4949d878577f6..c18dd6147cd6d 100644
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
index 83e2383dcdb55..47ffcb181da75 100644
--- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
+++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
index de0a49a82ac71..071e25034c0cc 100644
--- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
+++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 0012dfecb39d4..f94220bb7519f 100644
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 4949d878577f6..c18dd6147cd6d 100644
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 3f234b573f064..2f7bea00285d3 100644
--- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 8c2029491130c..14ca8338e717f 100644
--- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 3f234b573f064..2f7bea00285d3 100644
--- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 8c2029491130c..14ca8338e717f 100644
--- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 3f234b573f064..2f7bea00285d3 100644
--- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 8c2029491130c..14ca8338e717f 100644
--- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 3f234b573f064..2f7bea00285d3 100644
--- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 8c2029491130c..14ca8338e717f 100644
--- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 3f234b573f064..2f7bea00285d3 100644
--- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 8c2029491130c..14ca8338e717f 100644
--- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 3f234b573f064..2f7bea00285d3 100644
--- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 8c2029491130c..14ca8338e717f 100644
--- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index f6b5038fa642d..3891a74c0aef4 100644
--- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -125,91 +125,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 1e33bc76b41a0..83c0566df7ef9 100644
--- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 0012dfecb39d4..f94220bb7519f 100644
--- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 4949d878577f6..c18dd6147cd6d 100644
--- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 7b32e3b18e283..8ce68f5bbea94 100644
--- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 1bc81eae24373..ab3b1a27e4ea8 100644
--- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 7b32e3b18e283..8ce68f5bbea94 100644
--- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 1bc81eae24373..ab3b1a27e4ea8 100644
--- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 7b32e3b18e283..8ce68f5bbea94 100644
--- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 1bc81eae24373..ab3b1a27e4ea8 100644
--- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 7b32e3b18e283..8ce68f5bbea94 100644
--- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 1bc81eae24373..ab3b1a27e4ea8 100644
--- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index a1e27613acd34..54b61c15a1e9d 100644
--- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 0384cb96abb61..4d5a5429b08cd 100644
--- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 570e38c4c61d6..d7ba0c90843da 100644
--- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 210839250407c..6369bd043429d 100644
--- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 0012dfecb39d4..f94220bb7519f 100644
--- a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 4949d878577f6..c18dd6147cd6d 100644
--- a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
index 481c2661d2882..37fe2d18808b6 100644
--- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
index ddff08ca458b0..b7e0a5fdf1c16 100644
--- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
index 481c2661d2882..37fe2d18808b6 100644
--- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
index ddff08ca458b0..b7e0a5fdf1c16 100644
--- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
index b1f85192769eb..937d775efbece 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
index b1607b36bb53e..96814d08c0d10 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
index 7d82b288c82d2..2aae7c6f85744 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
index 6c336d214709d..93827f7bcdf12 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
index 7d82b288c82d2..2aae7c6f85744 100644
--- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
index 6c336d214709d..93827f7bcdf12 100644
--- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
index 1fc21b0e87e68..a43fbbebdc221 100644
--- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
index eddfbf58e773c..fd1848568316f 100644
--- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
index 141a8662cc681..f9849f6c83d0f 100644
--- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
index 05c11e5be1367..6be4de7c84b5d 100644
--- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
+++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 16a2d171396c0..d0c7f994d109d 100644
--- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 361e7ff976de8..6e86a27a767ea 100644
--- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 16a2d171396c0..d0c7f994d109d 100644
--- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 361e7ff976de8..6e86a27a767ea 100644
--- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-events-master-fsn1_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-events-master-fsn1_content
index f6e42fdb79017..163b9820b9009 100644
--- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-events-master-fsn1_content
+++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-events-master-fsn1_content
@@ -124,91 +124,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-main-master-fsn1_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-main-master-fsn1_content
index a891019e71432..1df64d90c1cce 100644
--- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-main-master-fsn1_content
+++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-main-master-fsn1_content
@@ -124,91 +124,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-events-control-plane-fr-par-1_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-events-control-plane-fr-par-1_content
index cd681540263d4..f16171583c9b5 100644
--- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-events-control-plane-fr-par-1_content
+++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-events-control-plane-fr-par-1_content
@@ -126,91 +126,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-main-control-plane-fr-par-1_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-main-control-plane-fr-par-1_content
index ffd67157516a1..8dfe5be8d4ae6 100644
--- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-main-control-plane-fr-par-1_content
+++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-main-control-plane-fr-par-1_content
@@ -126,91 +126,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index a476c50935830..e15c04e00328e 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
index a476c50935830..e15c04e00328e 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
index a476c50935830..e15c04e00328e 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 676f9c8b41011..aca88a8d09428 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
index 676f9c8b41011..aca88a8d09428 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
index 676f9c8b41011..aca88a8d09428 100644
--- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
+++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index a476c50935830..e15c04e00328e 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
index a476c50935830..e15c04e00328e 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
index a476c50935830..e15c04e00328e 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 676f9c8b41011..aca88a8d09428 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
index 676f9c8b41011..aca88a8d09428 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
index 676f9c8b41011..aca88a8d09428 100644
--- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
+++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 904c0a400877c..9e135e970b7ef 100644
--- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index fc1e612ae460f..2c066293b3652 100644
--- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 904c0a400877c..9e135e970b7ef 100644
--- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index fc1e612ae460f..2c066293b3652 100644
--- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 0012dfecb39d4..f94220bb7519f 100644
--- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 4949d878577f6..c18dd6147cd6d 100644
--- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 7e247166b1b18..4af4c114e212d 100644
--- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 42401e975f97c..cd49c904df82d 100644
--- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 7c35a102900fb..e6cdde35ba697 100644
--- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 9565572502d15..b7cbbb2cc0056 100644
--- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 87e86fe440a7b..f1268f6aedc04 100644
--- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 3ad1a0c6d6e1d..10c7e9de65ce6 100644
--- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 4ec1b9714ed29..ae1b1472b140b 100644
--- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index d1ed861129cff..311f658de78cd 100644
--- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 292f1fa77e407..a79e0c9429dd0 100644
--- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index e34aefc004d25..14ca81bb9c65f 100644
--- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 292f1fa77e407..a79e0c9429dd0 100644
--- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index e34aefc004d25..14ca81bb9c65f 100644
--- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 292f1fa77e407..a79e0c9429dd0 100644
--- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index e34aefc004d25..14ca81bb9c65f 100644
--- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-cilium-master-us-test-1a_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-cilium-master-us-test-1a_content
index 2509556ae742b..e86c5a860c6a7 100644
--- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-cilium-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-cilium-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 80469ce7249d7..b5b9cce5eb9bc 100644
--- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 095ffb5960121..d030a2ff2ee56 100644
--- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 04ec242095dc2..3ceb9f6ac5cef 100644
--- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 985310021997b..7186853a84bc8 100644
--- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index ba46f0825a811..7125776ade169 100644
--- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 86db0824d4ddf..43ac184f6e8ef 100644
--- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 4e4912fe41159..5664dbdd7d180 100644
--- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 8d1725d094935..63d5709ffcf0e 100644
--- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 81d77430fbf15..b06090e0a73bf 100644
--- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 46bd7c8ea8c95..43a379f460d29 100644
--- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 0012dfecb39d4..f94220bb7519f 100644
--- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 4949d878577f6..c18dd6147cd6d 100644
--- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 6fe40e4b39fb5..39e37a11ba724 100644
--- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 46fbbe8c6e960..737da8a9019dd 100644
--- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 24f8b4a4201d7..16c60e8e25457 100644
--- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 966e953eea6f1..7d24950e8d4e7 100644
--- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 7b32e3b18e283..8ce68f5bbea94 100644
--- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 1bc81eae24373..ab3b1a27e4ea8 100644
--- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -123,91 +123,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index aaa17764ad0fd..f1ba557a687a6 100644
--- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 5cbd70741ea85..04126fa99c70a 100644
--- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 0012dfecb39d4..f94220bb7519f 100644
--- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 4949d878577f6..c18dd6147cd6d 100644
--- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -122,91 +122,37 @@ spec:
       name: opt
   - args:
     - -t
-    - /opt/etcd-v3.5.0
+    - /opt/etcd-v3.5.9
     - /usr/local/bin/etcd
     - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.0-0
-    name: init-etcd-3-5-0
+    image: registry.k8s.io/etcd:3.5.9-0
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
       name: opt
   - args:
+    - -s
+    - /opt/etcd-v3.5.9/etcd
+    - /opt/etcd-v3.5.9/etcdctl
+    - -t
+    - /opt/etcd-v3.5.0
     - -t
     - /opt/etcd-v3.5.1
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.1-0
-    name: init-etcd-3-5-1
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.3
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.3-0
-    name: init-etcd-3-5-3
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.4
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.4-0
-    name: init-etcd-3-5-4
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.6
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.6-0
-    name: init-etcd-3-5-6
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
     - -t
     - /opt/etcd-v3.5.7
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.7-0
-    name: init-etcd-3-5-7
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - -t
-    - /opt/etcd-v3.5.9
-    - /usr/local/bin/etcd
-    - /usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-alpha.1
+    name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt