diff --git a/kicker.json b/kicker.json
index 3d826eeb218b9411c0e463b3fc7bffcfb3195aec..2422902397d8dceb986c731d31c4a9022070f78e 100644
--- a/kicker.json
+++ b/kicker.json
@@ -49,56 +49,56 @@
       "advanced": true
     },
     {
-      "name": "MAVEN_MVN_BUILD_JOB_TAGS",
+      "name": "MVN_BUILD_JOB_TAGS",
       "description": "Tags to be used for selecting runners for the job",
       "type": "array",
       "default": [],
       "advanced": true
     },
     {
-      "name": "MAVEN_MVN_SONAR_JOB_TAGS",
+      "name": "MVN_SONAR_JOB_TAGS",
       "description": "Tags to be used for selecting runners for the job",
       "type": "array",
       "default": [],
       "advanced": true
     },
     {
-      "name": "MAVEN_MVN_DEPENDENCY_CHECK_JOB_TAGS",
+      "name": "MVN_DEPENDENCY_CHECK_JOB_TAGS",
       "description": "Tags to be used for selecting runners for the job",
       "type": "array",
       "default": [],
       "advanced": true
     },
     {
-      "name": "MAVEN_MVN_NO_SNAPSHOT_DEPS_JOB_TAGS",
+      "name": "MVN_NO_SNAPSHOT_DEPS_JOB_TAGS",
       "description": "Tags to be used for selecting runners for the job",
       "type": "array",
       "default": [],
       "advanced": true
     },
     {
-      "name": "MAVEN_MVN_SBOM_JOB_TAGS",
+      "name": "MVN_SBOM_JOB_TAGS",
       "description": "Tags to be used for selecting runners for the job",
       "type": "array",
       "default": [],
       "advanced": true
     },
     {
-      "name": "MAVEN_MVN_DEPLOY_SNAPSHOT_JOB_TAGS",
+      "name": "MVN_DEPLOY_SNAPSHOT_JOB_TAGS",
       "description": "Tags to be used for selecting runners for the job",
       "type": "array",
       "default": [],
       "advanced": true
     },
     {
-      "name": "MAVEN_MVN_DEPLOY_RELEASE_JOB_TAGS",
+      "name": "MVN_DEPLOY_RELEASE_JOB_TAGS",
       "description": "Tags to be used for selecting runners for the job",
       "type": "array",
       "default": [],
       "advanced": true
     },
     {
-      "name": "MAVEN_MVN_RELEASE_JOB_TAGS",
+      "name": "MVN_RELEASE_JOB_TAGS",
       "description": "Tags to be used for selecting runners for the job",
       "type": "array",
       "default": [],
@@ -362,35 +362,7 @@
           "description": "Additional [`skopeo copy` arguments](https://github.com/containers/skopeo/blob/master/docs/skopeo-copy.1.md#options)"
         },
         {
-          "name": "MAVEN_JIB_MVN_BUILD_JOB_TAGS",
-          "description": "Tags to be used for selecting runners for the job",
-          "type": "array",
-          "default": [],
-          "advanced": true
-        },
-        {
-          "name": "MAVEN_JIB_MVN_SBOM_JOB_TAGS",
-          "description": "Tags to be used for selecting runners for the job",
-          "type": "array",
-          "default": [],
-          "advanced": true
-        },
-        {
-          "name": "MAVEN_JIB_MVN_TRIVY_JOB_TAGS",
-          "description": "Tags to be used for selecting runners for the job",
-          "type": "array",
-          "default": [],
-          "advanced": true
-        },
-        {
-          "name": "MAVEN_JIB_MVN_DEPLOY_RELEASE_JOB_TAGS",
-          "description": "Tags to be used for selecting runners for the job",
-          "type": "array",
-          "default": [],
-          "advanced": true
-        },
-        {
-          "name": "MAVEN_JIB_MVN_DEPLOY_SNAPSHOT_JOB_TAGS",
+          "name": "MVN_TRIVY_JOB_TAGS",
           "description": "Tags to be used for selecting runners for the job",
           "type": "array",
           "default": [],