diff --git a/Makefile b/Makefile
index eb8ab7ef..9c32002e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,11 @@ REGISTRY := public.ecr.aws/zero-downtime
 IMAGE := kubezero-admin
 REGION := us-east-1
 
+# Use KubeZero chart version rather than git tag for admin image
+GIT_TAG = v$(shell yq .version < charts/kubezero/Chart.yaml)
+
 # Also tag as Kubernetes major version
-MY_TAG = $(shell git describe --tags --match v*.*.* 2>/dev/null || git rev-parse --short HEAD 2>/dev/null)
-EXTRA_TAGS = $(shell echo $(MY_TAG) | awk -F '.' '{ print $$1 "." $$2 }')
+EXTRA_TAGS = $(shell echo $(GIT_TAG) | awk -F '.' '{ print $$1 "." $$2 }')
 
 include .ci/podman.mk
 
diff --git a/ecr_public_lifecycle.py b/ecr_public_lifecycle.py
deleted file mode 100755
index 7397dc43..00000000
--- a/ecr_public_lifecycle.py
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import boto3
-
-parser = argparse.ArgumentParser(
-    description='Implement basic public ECR lifecycle policy')
-parser.add_argument('--repo', dest='repositoryName', action='store', required=True,
-                    help='Name of the public ECR repository')
-parser.add_argument('--keep', dest='keep', action='store', default=10, type=int,
-                    help='number of tagged images to keep, default 10')
-parser.add_argument('--dev', dest='delete_dev', action='store_true',
-                    help='also delete in-development images only having tags like v0.1.1-commitNr-githash')
-
-args = parser.parse_args()
-
-client = boto3.client('ecr-public', region_name='us-east-1')
-
-images = client.describe_images(repositoryName=args.repositoryName)[
-    "imageDetails"]
-
-untagged = []
-kept = 0
-
-# actual Image
-# imageManifestMediaType: 'application/vnd.oci.image.manifest.v1+json'
-# image Index
-# imageManifestMediaType: 'application/vnd.oci.image.index.v1+json'
-
-# Sort by date uploaded
-for image in sorted(images, key=lambda d: d['imagePushedAt'], reverse=True):
-    # Remove all untagged
-    # if registry uses image index all actual images will be untagged anyways
-    if 'imageTags' not in image:
-        untagged.append({"imageDigest": image['imageDigest']})
-        # print("Delete untagged image {}".format(image["imageDigest"]))
-        continue
-
-    # check for dev tags
-    if args.delete_dev:
-        _delete = True
-        for tag in image["imageTags"]:
-            # Look for at least one tag NOT beign a SemVer dev tag
-            if "-" not in tag:
-                _delete = False
-        if _delete:
-            print("Deleting development image {}".format(image["imageTags"]))
-            untagged.append({"imageDigest": image['imageDigest']})
-            continue
-
-    if kept < args.keep:
-        kept = kept+1
-        print("Keeping tagged image {}".format(image["imageTags"]))
-        continue
-    else:
-        print("Deleting tagged image {}".format(image["imageTags"]))
-        untagged.append({"imageDigest": image['imageDigest']})
-
-deleted_images = client.batch_delete_image(
-    repositoryName=args.repositoryName, imageIds=untagged)
-
-if deleted_images["imageIds"]:
-    print("Deleted images: {}".format(deleted_images["imageIds"]))