diff --git a/charts/onechart/templates/service.yaml b/charts/onechart/templates/service.yaml
index fe4119f..aeb9cf3 100644
--- a/charts/onechart/templates/service.yaml
+++ b/charts/onechart/templates/service.yaml
@@ -10,39 +10,39 @@ metadata:
     {{- if .Values.gitRepository }}
     gimlet.io/git-repository: {{ .Values.gitRepository }}
     {{- $parts := split "/" .Values.gitRepository }}
-    opensca.dev/v0.1.0/vcs/owner: {{ $parts._0 }}
-    opensca.dev/v0.1.0/vcs/name: {{ $parts._1 }}
+    v1alpha1.opensca.dev/vcs.owner: {{ $parts._0 }}
+    v1alpha1.opensca.dev/vcs.name: {{ $parts._1 }}
     {{- end }}
     {{- if .Values.gitSha }}
     gimlet.io/git-sha: {{ .Values.gitSha }}
-    opensca.dev/v0.1.0/version/sha: {{ .Values.gitSha }}
+    v1alpha1.opensca.dev/version.sha: {{ .Values.gitSha }}
     {{- end }}
     {{- if .Values.serviceName }}
-    opensca.dev/v0.1.0/name: {{ .Values.serviceName | quote }}
+    v1alpha1.opensca.dev/name: {{ .Values.serviceName | quote }}
     {{- end }}
     {{- if .Values.serviceDescription }}
-    opensca.dev/v0.1.0/description: {{ .Values.serviceDescription | quote }}
+    v1alpha1.opensca.dev/description: {{ .Values.serviceDescription | quote }}
     {{- end }}
     {{- if .Values.ownerName }}
-    opensca.dev/v0.1.0/owner/name: {{ .Values.ownerName | quote }}
+    v1alpha1.opensca.dev/owner.name: {{ .Values.ownerName | quote }}
     {{- end }}
     {{- if .Values.ownerIm }}
-    opensca.dev/v0.1.0/owner/im: {{ .Values.ownerIm | quote }}
+    v1alpha1.opensca.dev/owner.im: {{ .Values.ownerIm | quote }}
     {{- end }}
     {{- if .Values.documentation }}
-    opensca.dev/v0.1.0/documentation: {{ .Values.documentation | quote }}
+    v1alpha1.opensca.dev/documentation: {{ .Values.documentation | quote }}
     {{- end }}
     {{- if .Values.logs }}
-    opensca.dev/v0.1.0/logs: {{ .Values.logs | quote }}
+    v1alpha1.opensca.dev/logs: {{ .Values.logs | quote }}
     {{- end }}
     {{- if .Values.metrics }}
-    opensca.dev/v0.1.0/metrics: {{ .Values.metrics | quote }}
+    v1alpha1.opensca.dev/metrics: {{ .Values.metrics | quote }}
     {{- end }}
     {{- if .Values.issues }}
-    opensca.dev/v0.1.0/issues: {{ .Values.issues | quote }}
+    v1alpha1.opensca.dev/issues: {{ .Values.issues | quote }}
     {{- end }}
     {{- if .Values.traces }}
-    opensca.dev/v0.1.0/traces: {{ .Values.traces | quote }}
+    v1alpha1.opensca.dev/traces: {{ .Values.traces | quote }}
     {{- end }}
   {{- end }}
 spec:
diff --git a/charts/onechart/tests/service_taxonomy_test.yaml b/charts/onechart/tests/service_taxonomy_test.yaml
index df7c34d..2c91240 100644
--- a/charts/onechart/tests/service_taxonomy_test.yaml
+++ b/charts/onechart/tests/service_taxonomy_test.yaml
@@ -21,15 +21,15 @@ tests:
           value:
             gimlet.io/git-repository: laszlocph/demo-app
             gimlet.io/git-sha: xyz
-            opensca.dev/v0.1.0/vcs/owner: laszlocph
-            opensca.dev/v0.1.0/vcs/name: demo-app
-            opensca.dev/v0.1.0/version/sha: xyz
-            opensca.dev/v0.1.0/name: cart-backend
-            opensca.dev/v0.1.0/description: "Backend to manage shopping cart state, written in Go"
-            opensca.dev/v0.1.0/owner/name: "backend-team"
-            opensca.dev/v0.1.0/owner/im: "#backend-team"
-            opensca.dev/v0.1.0/documentation: https://confluence.mycompany.com/cart-backend
-            opensca.dev/v0.1.0/logs: https://grafana.mycompany.com/logs
-            opensca.dev/v0.1.0/metrics: https://grafana.mycompany.com/cart-dashboard
-            opensca.dev/v0.1.0/issues: https://jira.mycompany.com/cart-backend
-            opensca.dev/v0.1.0/traces: https://jaeger.mycompany.com/cart-dashboard
+            v1alpha1.opensca.dev/vcs.owner: laszlocph
+            v1alpha1.opensca.dev/vcs.name: demo-app
+            v1alpha1.opensca.dev/version.sha: xyz
+            v1alpha1.opensca.dev/name: cart-backend
+            v1alpha1.opensca.dev/description: "Backend to manage shopping cart state, written in Go"
+            v1alpha1.opensca.dev/owner.name: "backend-team"
+            v1alpha1.opensca.dev/owner.im: "#backend-team"
+            v1alpha1.opensca.dev/documentation: https://confluence.mycompany.com/cart-backend
+            v1alpha1.opensca.dev/logs: https://grafana.mycompany.com/logs
+            v1alpha1.opensca.dev/metrics: https://grafana.mycompany.com/cart-dashboard
+            v1alpha1.opensca.dev/issues: https://jira.mycompany.com/cart-backend
+            v1alpha1.opensca.dev/traces: https://jaeger.mycompany.com/cart-dashboard