diff --git a/.github/workflows/pipeline.yaml b/.github/workflows/pipeline.yaml
index 2c9c1744..e53d9758 100644
--- a/.github/workflows/pipeline.yaml
+++ b/.github/workflows/pipeline.yaml
@@ -70,8 +70,8 @@ jobs:
 
       - name: Configure Git
         run: |
-          git config user.name "$GITHUB_ACTOR"
-          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
+          git config user.name "${{ github.actor }}"
+          git config user.email "${{ github.actor }}@users.noreply.github.com"
 
       - name: Download Helm chart
         uses: actions/download-artifact@v3
@@ -112,8 +112,8 @@ jobs:
 
       - name: Configure Git
         run: |
-          git config user.name "$GITHUB_ACTOR"
-          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
+          git config user.name "${{ github.actor }}"
+          git config user.email "${{ github.actor }}@users.noreply.github.com"
 
       - name: Version
         id: version
@@ -150,6 +150,13 @@ jobs:
             type=schedule
             type=semver,pattern={{version}},value=${{ steps.version.outputs.version_full }}
             type=sha
+          labels: |
+            io.artifacthub.package.category=integration-delivery
+            io.artifacthub.package.keywords=agent,azure,azure-devops,azure-pipelines,container,devops,docker,helm,kubernetes,pipelines
+            io.artifacthub.package.logo-url=https://raw.githubusercontent.com/${{ env.CONTAINER_NAME }}/${{ github.sha }}/logo.svg
+            io.artifacthub.package.maintainers=[{"name":"${{ github.actor }}","email":"${{ github.actor }}@users.noreply.github.com"}]
+            io.artifacthub.package.readme-url=https://raw.githubusercontent.com/${{ env.CONTAINER_NAME }}/${{ github.sha }}/README.md
+            io.artifacthub.package.license=MIT
 
       - name: Build/push container
         uses: docker/build-push-action@v4
diff --git a/LICENCE b/LICENCE
new file mode 100644
index 00000000..0675af23
--- /dev/null
+++ b/LICENCE
@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2023 Clémence Lesné, clemence@lesne.pro
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/artifacthub-repo.yml b/artifacthub-repo.yml
index 60186fb8..deb9f14c 100644
--- a/artifacthub-repo.yml
+++ b/artifacthub-repo.yml
@@ -2,5 +2,5 @@
 # See: https://artifacthub.io/packages/search?repo=azure-pipelines-agent
 repositoryID: 9cc083d3-128e-4cbb-934f-8c62b42ef538
 owners:
-  - name: Clémence Lesné
-    email: clemence@lesne.pro
+  - name: clemlesne
+    email: clemlesne@users.noreply.github.com
diff --git a/src/helm/azure-pipelines-agent/Chart.yaml b/src/helm/azure-pipelines-agent/Chart.yaml
index 36bbc277..dc44ce55 100644
--- a/src/helm/azure-pipelines-agent/Chart.yaml
+++ b/src/helm/azure-pipelines-agent/Chart.yaml
@@ -6,19 +6,22 @@ version: 0.0.0
 appVersion: 0.0.0
 icon: https://raw.githubusercontent.com/clemlesne/azure-pipelines-agent/master/logo.svg
 keywords:
-- agent
-- azure
-- azure-devops
-- azure-pipelines
-- container
-- devops
-- docker
-- helm
-- kubernetes
-- pipelines
+  - agent
+  - azure
+  - azure-devops
+  - azure-pipelines
+  - container
+  - devops
+  - docker
+  - helm
+  - kubernetes
+  - pipelines
 home: https://github.com/clemlesne/azure-pipelines-agent
 sources:
-- https://github.com/clemlesne/azure-pipelines-agent
+  - https://github.com/clemlesne/azure-pipelines-agent
 maintainers:
-- name: clemlesne
-  email: clemence@lesne.pro
+  - name: clemlesne
+    email: clemlesne@users.noreply.github.com
+annotations:
+  artifacthub.io/category: integration-delivery
+  artifacthub.io/license: MIT
diff --git a/src/helm/azure-pipelines-agent/templates/statefulset.yaml b/src/helm/azure-pipelines-agent/templates/statefulset.yaml
index 0657d2c9..8da529a6 100644
--- a/src/helm/azure-pipelines-agent/templates/statefulset.yaml
+++ b/src/helm/azure-pipelines-agent/templates/statefulset.yaml
@@ -47,7 +47,7 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
             {{- end }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.repository }}-{{ .Values.image.tagSuffix | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             - name: AZP_AGENT_NAME
diff --git a/src/helm/azure-pipelines-agent/values.yaml b/src/helm/azure-pipelines-agent/values.yaml
index 75f5d633..c6bdddc7 100644
--- a/src/helm/azure-pipelines-agent/values.yaml
+++ b/src/helm/azure-pipelines-agent/values.yaml
@@ -5,10 +5,10 @@
 replicaCount: 1
 
 image:
-  repository: ghcr.io/clemlesne/azure-pipelines-agent:bullseye-main
+  repository: ghcr.io/clemlesne/azure-pipelines-agent:bullseye
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: ""
+  tagSuffix: ""
 
 imagePullSecrets: []
 nameOverride: ""