[8.17](backport #6724) [k8s] Correct agent image repository (#6851)

* [k8s] Correct agent image repository (#6724) * fix: correct agent image repository * fix: update agent image repository in more places * fix default docker image repository --------- Co-authored-by: Paolo Chila <paolo.chila@elastic.co> (cherry picked from commit ed7c19f) # Conflicts: # deploy/helm/edot-collector/kube-stack/values.yaml # deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml # deploy/helm/elastic-agent/examples/fleet-managed-ksm-sharding/rendered/manifest.yaml # deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml # deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml # deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml # deploy/helm/elastic-agent/examples/kubernetes-ksm-sharding/rendered/manifest.yaml # deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml # deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml # deploy/helm/elastic-agent/examples/netflow-service/rendered/manifest.yaml # deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml # deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml # deploy/helm/elastic-agent/examples/user-cluster-role/rendered/manifest.yaml # deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml # deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml # deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml # deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml # deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml # deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml # deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml # deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml # deploy/kubernetes/elastic-agent-managed-kubernetes.yaml # deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml * fix: resolve conflicts * fix: remove ksm helm examples * fix: remove netflow helm examples --------- Co-authored-by: Panos Koutsovasilis <panos.koutsovasilis@elastic.co>
elastic · Feb 14, 2025 · b64c3ee · b64c3ee
1 parent cd37b48
commit b64c3ee
Show file tree

Hide file tree

Showing 31 changed files with 53 additions and 55 deletions.
diff --git a/deploy/helm/edot-collector/kube-stack/values.yaml b/deploy/helm/edot-collector/kube-stack/values.yaml
@@ -16,7 +16,7 @@ crds:
   create: true # Install the OpenTelemetry Operator CRDs.
 defaultCRConfig:
   image:
-    repository: "docker.elastic.co/beats/elastic-agent"
+    repository: "docker.elastic.co/elastic-agent/elastic-agent"
     tag: "8.17.3"
   targetAllocator:
     enabled: false # Enable/disable the Operator's Target allocator.

diff --git a/deploy/helm/elastic-agent/README.md b/deploy/helm/elastic-agent/README.md
@@ -5,7 +5,7 @@
 
 # elastic-agent
 
-![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 8.17.3-beta](https://img.shields.io/badge/Version-8.17.3--beta-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.17.3](https://img.shields.io/badge/AppVersion-8.17.3-informational?style=flat-square)
 
 Elastic-Agent Helm Chart
 
@@ -143,8 +143,8 @@ The chart built-in [kubernetes integration](https://docs.elastic.co/integrations
 ### 6 - Elastic-Agent Configuration
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| agent.version | string | `"9.0.0"` | elastic-agent version |
-| agent.image | object | `{"pullPolicy":"IfNotPresent","repository":"docker.elastic.co/beats/elastic-agent","tag":"9.0.0-SNAPSHOT"}` | image configuration |
+| agent.version | string | `"8.17.3"` | elastic-agent version |
+| agent.image | object | `{"pullPolicy":"IfNotPresent","repository":"docker.elastic.co/elastic-agent/elastic-agent","tag":"8.17.3-SNAPSHOT"}` | image configuration |
 | agent.imagePullSecrets | list | `[]` | image pull secrets |
 | agent.engine | string | `"k8s"` | generate kubernetes manifests or [ECK](https://github.com/elastic/cloud-on-k8s) CRDs |
 | agent.unprivileged | bool | `false` | enable unprivileged mode |

diff --git a/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml
@@ -1100,7 +1100,7 @@ spec:
             value: /usr/share/elastic-agent/state
           - name: ELASTIC_NETINFO
             value: "false"
-          image: docker.elastic.co/beats/elastic-agent:8.17.3-SNAPSHOT
+          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
           imagePullPolicy: IfNotPresent
           name: agent
           resources:
@@ -1203,7 +1203,7 @@ spec:
             value: /usr/share/elastic-agent/state
           - name: ELASTIC_NETINFO
             value: "false"
-          image: docker.elastic.co/beats/elastic-agent:8.17.3-SNAPSHOT
+          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
           imagePullPolicy: IfNotPresent
           name: agent
           resources:
@@ -1312,7 +1312,7 @@ spec:
             value: /usr/share/elastic-agent/state
           - name: ELASTIC_NETINFO
             value: "false"
-          image: docker.elastic.co/beats/elastic-agent:8.17.3-SNAPSHOT
+          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
           imagePullPolicy: IfNotPresent
           name: agent
           resources:

diff --git a/deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml
@@ -183,7 +183,7 @@ spec:
           value: "false"
         - name: FLEET_ENROLL
           value: "1"
-        image: docker.elastic.co/beats/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:

diff --git a/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
@@ -1100,7 +1100,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/beats/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1220,7 +1220,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/beats/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1342,7 +1342,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/beats/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:

diff --git a/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml
@@ -1102,7 +1102,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/beats/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1247,7 +1247,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/beats/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1369,7 +1369,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/beats/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:

diff --git a/deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml
@@ -244,7 +244,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/beats/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:

diff --git a/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml
@@ -1128,7 +1128,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/beats/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1263,7 +1263,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/beats/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1375,7 +1375,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/beats/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:

diff --git a/deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml
@@ -93,7 +93,7 @@ spec:
               fieldPath: metadata.name
         - name: STATE_PATH
           value: /usr/share/elastic-agent/state
-        image: docker.elastic.co/beats/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         securityContext:

diff --git a/deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml
@@ -324,7 +324,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/beats/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:

diff --git a/deploy/helm/elastic-agent/examples/user-cluster-role/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/user-cluster-role/rendered/manifest.yaml
@@ -132,7 +132,7 @@ spec:
               fieldPath: metadata.name
         - name: STATE_PATH
           value: /usr/share/elastic-agent/state
-        image: docker.elastic.co/beats/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         securityContext:

diff --git a/deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml
@@ -1070,7 +1070,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/beats/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1190,7 +1190,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/beats/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1312,7 +1312,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/beats/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:

diff --git a/deploy/helm/elastic-agent/values.yaml b/deploy/helm/elastic-agent/values.yaml
@@ -329,7 +329,7 @@ agent:
   # -- image configuration
   # @section -- 6 - Elastic-Agent Configuration
   image:
-    repository: docker.elastic.co/beats/elastic-agent
+    repository: docker.elastic.co/elastic-agent/elastic-agent
     pullPolicy: IfNotPresent
     tag: "8.17.3-SNAPSHOT"
   # -- image pull secrets

diff --git a/...c-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml b/...c-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
         - name: elastic-agent
-          image: docker.elastic.co/beats/elastic-agent:8.17.3
+          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3
           env:
             # Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode
             - name: FLEET_ENROLL

diff --git a/...t-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml b/...t-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       # Uncomment if using hints feature
       #initContainers:
       #  - name: k8s-templates-downloader
-      #    image: docker.elastic.co/beats/elastic-agent:8.17.3
+      #    image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3
       #    command: ['bash']
       #    args:
       #      - -c
@@ -40,7 +40,7 @@ spec:
       #        mountPath: /etc/elastic-agent/inputs.d
       containers:
         - name: elastic-agent-standalone
-          image: docker.elastic.co/beats/elastic-agent:8.17.3
+          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3
           args: ["-c", "/etc/elastic-agent/agent.yml", "-e"]
           env:
             # The API Key with access privilleges to connect to Elasticsearch. https://www.elastic.co/guide/en/fleet/current/grant-access-to-elasticsearch.html#create-api-key-standalone-agent

diff --git a/...ustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml b/...ustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
         - name: elastic-agent
-          image: docker.elastic.co/beats/elastic-agent:8.17.3
+          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3
           env:
             # Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode
             - name: FLEET_ENROLL

diff --git a/...omize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml b/...omize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml
@@ -27,7 +27,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
         - name: elastic-agent
-          image: docker.elastic.co/beats/elastic-agent:8.17.3
+          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3
           env:
             # Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode
             - name: FLEET_ENROLL

diff --git a/...ze/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml b/...ze/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       # Uncomment if using hints feature
       #initContainers:
       #  - name: k8s-templates-downloader
-      #    image: docker.elastic.co/beats/elastic-agent:8.17.3
+      #    image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3
       #    command: ['bash']
       #    args:
       #      - -c
@@ -40,7 +40,7 @@ spec:
       #        mountPath: /etc/elastic-agent/inputs.d
       containers:
         - name: elastic-agent-standalone
-          image: docker.elastic.co/beats/elastic-agent:8.17.3
+          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3
           args: ["-c", "/etc/elastic-agent/agent.yml", "-e"]
           env:
             # The API Key with access privilleges to connect to Elasticsearch. https://www.elastic.co/guide/en/fleet/current/grant-access-to-elasticsearch.html#create-api-key-standalone-agent

diff --git a/...ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml b/...ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml
@@ -28,7 +28,7 @@ spec:
       # Uncomment if using hints feature
       #initContainers:
       #  - name: k8s-templates-downloader
-      #    image: docker.elastic.co/beats/elastic-agent:8.17.3
+      #    image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3
       #    command: ['bash']
       #    args:
       #      - -c
@@ -40,7 +40,7 @@ spec:
       #        mountPath: /etc/elastic-agent/inputs.d
       containers:
         - name: elastic-agent-standalone
-          image: docker.elastic.co/beats/elastic-agent:8.17.3
+          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3
           args: ["-c", "/etc/elastic-agent/agent.yml", "-e"]
           env:
             # The API Key with access privilleges to connect to Elasticsearch. https://www.elastic.co/guide/en/fleet/current/grant-access-to-elasticsearch.html#create-api-key-standalone-agent

diff --git a/.../kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml b/.../kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml
@@ -19,7 +19,7 @@ patches:
         spec:
           initContainers:
             - name: k8s-templates-downloader
-              image: docker.elastic.co/beats/elastic-agent:8.17.3
+              image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3
               command: ['bash']
               args:
                 - -c
@@ -37,4 +37,3 @@ patches:
           volumes:
             - name: external-inputs
               emptyDir: {}
-          
diff --git a/...es/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml.original b/...es/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml.original
@@ -19,7 +19,7 @@ patches:
         spec:
           initContainers:
             - name: k8s-templates-downloader
-              image: docker.elastic.co/beats/elastic-agent:%VERSION%
+              image: docker.elastic.co/elastic-agent/elastic-agent:%VERSION%
               command: ['bash']
               args:
                 - -c
@@ -37,4 +37,3 @@ patches:
           volumes:
             - name: external-inputs
               emptyDir: {}
-
diff --git a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml
@@ -27,7 +27,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
         - name: elastic-agent
-          image: docker.elastic.co/beats/elastic-agent:8.17.3
+          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3
           env:
             # Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode
             - name: FLEET_ENROLL

diff --git a/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml b/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
         - name: elastic-agent
-          image: docker.elastic.co/beats/elastic-agent:%VERSION%
+          image: docker.elastic.co/elastic-agent/elastic-agent:%VERSION%
           env:
             # Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode
             - name: FLEET_ENROLL

diff --git a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml
@@ -704,7 +704,7 @@ spec:
       # Uncomment if using hints feature
       #initContainers:
       #  - name: k8s-templates-downloader
-      #    image: docker.elastic.co/beats/elastic-agent:8.17.3
+      #    image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3
       #    command: ['bash']
       #    args:
       #      - -c
@@ -716,7 +716,7 @@ spec:
       #        mountPath: /etc/elastic-agent/inputs.d
       containers:
         - name: elastic-agent-standalone
-          image: docker.elastic.co/beats/elastic-agent:8.17.3
+          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3
           args: ["-c", "/etc/elastic-agent/agent.yml", "-e"]
           env:
             # The API Key with access privilleges to connect to Elasticsearch. https://www.elastic.co/guide/en/fleet/current/grant-access-to-elasticsearch.html#create-api-key-standalone-agent

diff --git a/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml b/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       # Uncomment if using hints feature
       #initContainers:
       #  - name: k8s-templates-downloader
-      #    image: docker.elastic.co/beats/elastic-agent:%VERSION%
+      #    image: docker.elastic.co/elastic-agent/elastic-agent:%VERSION%
       #    command: ['bash']
       #    args:
       #      - -c
@@ -40,7 +40,7 @@ spec:
       #        mountPath: /etc/elastic-agent/inputs.d
       containers:
         - name: elastic-agent-standalone
-          image: docker.elastic.co/beats/elastic-agent:%VERSION%
+          image: docker.elastic.co/elastic-agent/elastic-agent:%VERSION%
           args: ["-c", "/etc/elastic-agent/agent.yml", "-e"]
           env:
             # The API Key with access privilleges to connect to Elasticsearch. https://www.elastic.co/guide/en/fleet/current/grant-access-to-elasticsearch.html#create-api-key-standalone-agent

diff --git a/dev-tools/packaging/packages.yml b/dev-tools/packaging/packages.yml
@@ -251,7 +251,7 @@ shared:
 
   - &docker_elastic_spec
     extra_vars:
-      repository: 'docker.elastic.co/beats'
+      repository: 'docker.elastic.co/elastic-agent'
 
   - &agent_docker_spec
     <<: *agent_binary_spec