diff --git a/src/meta.ts b/src/meta.ts
index 378634b..0a0664a 100644
--- a/src/meta.ts
+++ b/src/meta.ts
@@ -169,7 +169,7 @@ export class Meta {
       if (!tmatch) {
         core.warning(`${tag.attrs['match']} does not match ${vraw}.`);
       } else {
-        vraw = this.setValue(tmatch[1], tag);
+        vraw = tmatch[1];
       }
     }
 
@@ -207,8 +207,20 @@ export class Meta {
     if (tag.attrs['value'].length > 0) {
       vraw = this.setGlobalExp(tag.attrs['value']);
     } else {
-      vraw = this.context.ref.replace(/^refs\/tags\//g, '').replace(/\//g, '-');
+      vraw = this.context.ref.replace(/^refs\/tags\//g, '');
     }
+
+    if (tag.attrs['match'].length > 0) {
+      const tmatch = vraw.match(tag.attrs['match']);
+      if (!tmatch) {
+        core.warning(`${tag.attrs['match']} does not match ${vraw}.`);
+      } else {
+        vraw = tmatch[1];
+      }
+    }
+
+    vraw = vraw.replace(/\//g, '-');
+
     if (!pep440.valid(vraw)) {
       core.warning(`${vraw} does not conform to PEP 440. More info: https://www.python.org/dev/peps/pep-0440`);
       return version;