diff --git a/Taskfile.variables.yml b/Taskfile.variables.yml
index f68507b..f597bf6 100644
--- a/Taskfile.variables.yml
+++ b/Taskfile.variables.yml
@@ -41,6 +41,18 @@ vars:
   DOCKER_NAME: '{{.DOCKER_ORG_NAME}}/{{.DOCKER_IMAGE}}'
   GITHUB_NAME: '{{.GITHUB_ORG_NAME}}/{{.GITHUB_REPO}}'
   GHRC_NAME: ghcr.io/{{.GITHUB_ORG_NAME}}/{{.GITHUB_REPO}}
+  DEFAULT_BRANCH: master
+  VERSION_FROM_ACTION_YML:
+    sh: 'grep "image: docker://{{.DOCKER_NAME}}:" action.yml | cut -d ":" -f 4'
+  AUTHOR_FROM_ACTION_YML:
+    sh: |
+      grep -e "^author:" action.yml | head -1 | awk -F": " '{print $2}'
+  NAME_FROM_ACTION_YML:
+    sh: |
+      grep -e "^name:" action.yml | head -1 | awk -F": " '{print $2}'
+  DESCRIPTION_FROM_ACTION_YML:
+    sh: |
+      grep -e "^description:" action.yml | head -1 | awk -F": " '{print $2}'
   LABEL_AUTHOR: '{{.LABEL_AUTHOR | default .AUTHOR_FROM_ACTION_YML}}'
   LABEL_NAME: '{{.LABEL_NAME | default .NAME_FROM_ACTION_YML}}'
   LABEL_DESCRIPTION: '{{.LABEL_DESCRIPTION | default .DESCRIPTION_FROM_ACTION_YML}}'
@@ -52,23 +64,6 @@ vars:
   LABEL_VENDOR: '{{.LABEL_VENDOR | default "DevOps-Infra"}}'
   LABEL_LICENSE: '{{.LABEL_LICENSE | default "MIT"}}'
 
-  # Action metadata
-  AUTHOR_FROM_ACTION_YML:
-    sh: |
-      awk -F":" '/^author:/ { $1=""; sub(/^[: ]+/, ""); gsub(/^\"|\"$/,"",$0); print $0; exit }' action.yml || true
-  NAME_FROM_ACTION_YML:
-    sh: |
-      awk -F":" '/^name:/ { $1=""; sub(/^[: ]+/, ""); gsub(/^\"|\"$/,"",$0); print $0; exit }' action.yml || true
-  DESCRIPTION_FROM_ACTION_YML:
-    sh: |
-      awk -F":" '/^description:/ { $1=""; sub(/^[: ]+/, ""); gsub(/^\"|\"$/,"",$0); print $0; exit }' action.yml || true
-  VERSION_FROM_ACTION_YML:
-    sh: 'grep "image: docker://{{.DOCKER_NAME}}:" action.yml | cut -d ":" -f 4'
-  MAJOR_FROM_ACTION_YML:
-    sh: echo "{{.VERSION_FROM_ACTION_YML}}" | awk -F\. '{print $1}'
-  MINOR_FROM_ACTION_YML:
-    sh: echo "{{.VERSION_FROM_ACTION_YML}}" | awk -F\. '{print $1"."$2}'
-
   # Build context
   CONTEXT: '{{.CONTEXT | default "."}}'
   DOCKERFILE: '{{.DOCKERFILE | default "Dockerfile"}}'
@@ -115,9 +110,12 @@ vars:
     sh: echo $(( {{.MINOR}} + 1 ))
   NEXT_MAJOR:
     sh: echo $(( {{.MAJOR}} + 1 ))
+  MAJOR_FROM_ACTION_YML:
+    sh: echo "{{.VERSION_FROM_ACTION_YML}}" | awk -F\. '{print $1}'
+  MINOR_FROM_ACTION_YML:
+    sh: echo "{{.VERSION_FROM_ACTION_YML}}" | awk -F\. '{print $1"."$2}'
 
   # Git metadata
-  DEFAULT_BRANCH: master
   GIT_SHA:
     sh: git rev-parse HEAD 2>/dev/null || echo 0000000000000000000000000000000000000000
   GIT_SHORT_SHA:
@@ -133,6 +131,27 @@ vars:
   # Labels for http://label-schema.org/rc1/#build-time-labels
   # And for https://github.com/opencontainers/image-spec/blob/master/annotations.md
   ANNOTATIONS: >-
+    --annotation index:org.label-schema.schema-version="1.0"
+    --annotation index:org.label-schema.build-date="{{.BUILD_DATE}}"
+    --annotation index:org.label-schema.name="{{.LABEL_NAME}}"
+    --annotation index:org.label-schema.description="{{.LABEL_DESCRIPTION}}"
+    --annotation index:org.label-schema.usage="{{.LABEL_DOCS_URL}}"
+    --annotation index:org.label-schema.url="{{.LABEL_HOMEPAGE}}"
+    --annotation index:org.label-schema.vcs-url="{{.LABEL_REPO_URL}}"
+    --annotation index:org.label-schema.vcs-ref="{{.GIT_SHA}}"
+    --annotation index:org.label-schema.vendor="{{.LABEL_VENDOR}}"
+    --annotation index:org.label-schema.version="{{.VERSION_FULL}}{{.VERSION_SUFFIX}}"
+    --annotation index:org.opencontainers.image.created="{{.BUILD_DATE}}"
+    --annotation index:org.opencontainers.image.authors="{{.LABEL_AUTHOR}}"
+    --annotation index:org.opencontainers.image.url="{{.LABEL_HOMEPAGE}}"
+    --annotation index:org.opencontainers.image.documentation="{{.LABEL_DOCS_URL}}"
+    --annotation index:org.opencontainers.image.source="{{.LABEL_REPO_URL}}"
+    --annotation index:org.opencontainers.image.version="{{.VERSION_FULL}}{{.VERSION_SUFFIX}}"
+    --annotation index:org.opencontainers.image.revision="{{.GIT_SHA}}"
+    --annotation index:org.opencontainers.image.vendor="{{.LABEL_VENDOR}}"
+    --annotation index:org.opencontainers.image.licenses="{{.LABEL_LICENSE}}"
+    --annotation index:org.opencontainers.image.title="{{.LABEL_NAME}}"
+    --annotation index:org.opencontainers.image.description="{{.LABEL_DESCRIPTION}}"
     --annotation manifest:org.label-schema.schema-version="1.0"
     --annotation manifest:org.label-schema.build-date="{{.BUILD_DATE}}"
     --annotation manifest:org.label-schema.name="{{.LABEL_NAME}}"