diff --git a/charts/chia/upgrade_strategy b/charts/chia/upgrade_strategy
index adafa41868..6b95867d8d 100755
--- a/charts/chia/upgrade_strategy
+++ b/charts/chia/upgrade_strategy
@@ -7,13 +7,14 @@ from catalog_update.upgrade_strategy import semantic_versioning
 
 def newer_mapping(image_tags):
     key = list(image_tags.keys())[0]
+    tags = {t.strip('v').replace('_', '.'): t for t in image_tags[key]}
     version = semantic_versioning(image_tags[key])
     if not version:
         return {}
 
     return {
-        'tags': {key: version},
-        'app_version': version,
+        'tags': {key: tags[version]},
+        'app_version': tags[version],
     }
 
 
diff --git a/test/chia/upgrade_strategy b/test/chia/upgrade_strategy
index adafa41868..6b95867d8d 100755
--- a/test/chia/upgrade_strategy
+++ b/test/chia/upgrade_strategy
@@ -7,13 +7,14 @@ from catalog_update.upgrade_strategy import semantic_versioning
 
 def newer_mapping(image_tags):
     key = list(image_tags.keys())[0]
+    tags = {t.strip('v').replace('_', '.'): t for t in image_tags[key]}
     version = semantic_versioning(image_tags[key])
     if not version:
         return {}
 
     return {
-        'tags': {key: version},
-        'app_version': version,
+        'tags': {key: tags[version]},
+        'app_version': tags[version],
     }