diff --git a/CHANGELOG.md b/CHANGELOG.md
index 381589a7134f54ddd0c7abfeec245ce713b9308f..fd60247b298dca90fab49ebe60fed60ba246dab9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.2.1] - 2021-12-23
+
+### Fixed
+
+- \[Chart\] Fix service selectors for multiple linkups
+
 ## [2.2.0] - 2021-12-23
 
 ### Added
@@ -64,6 +70,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Initial release
 
+[2.2.1]: https://edugit.org/AlekSIS/libs/k8s-linkup/-/tags/2.2.1
 [2.2.0]: https://edugit.org/AlekSIS/libs/k8s-linkup/-/tags/2.2.0
 [2.1.3]: https://edugit.org/AlekSIS/libs/k8s-linkup/-/tags/2.1.3
 [2.1.2]: https://edugit.org/AlekSIS/libs/k8s-linkup/-/tags/2.1.2
diff --git a/charts/k8s-linkup/Chart.yaml b/charts/k8s-linkup/Chart.yaml
index f2503bd12627e13378ef3859c61b0cbec59f99e9..f92a52fb578f3f99edec64abe9881af6023227d2 100644
--- a/charts/k8s-linkup/Chart.yaml
+++ b/charts/k8s-linkup/Chart.yaml
@@ -11,8 +11,8 @@ annotations:
   artifacthub.io/screenshots: |
     - title: k8s-linkup running with OpenVPN backend in k9s
       url: https://edugit.org/AlekSIS/libs/k8s-linkup/-/raw/master/screenshot.webp
-  artifacthub.io/changes: |
-    - Allow configuration of timeouts per linkup and per port mapping
+  artifacthub.io/changes:
+    - Fix service selectors for multiple linkups
 
 # A chart can be either an 'application' or a 'library' chart.
 #
@@ -27,9 +27,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.2.0
+version: 2.2.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 2.2.0
+appVersion: 2.2.1
diff --git a/charts/k8s-linkup/templates/deployment.yaml b/charts/k8s-linkup/templates/deployment.yaml
index 2bb66ace61936e7a9cfa5784708665a50e7f8778..e8c0b3ecbcf4b1b69e23dc91302ee978a17854d9 100644
--- a/charts/k8s-linkup/templates/deployment.yaml
+++ b/charts/k8s-linkup/templates/deployment.yaml
@@ -17,6 +17,7 @@ spec:
         {{- toYaml . | nindent 8 }}
     {{- end }}
       labels:
+        aleksis.edugit.io/k8s-linkup-name: {{ .name }}
         {{- include "k8s-linkup.selectorLabels" $ | nindent 8 }}
     spec:
       {{- with $.Values.imagePullSecrets }}
diff --git a/charts/k8s-linkup/templates/service.yaml b/charts/k8s-linkup/templates/service.yaml
index d19f5b1d935e4e330531a8ccbaf931020d420634..2b161488a9834cd162aafb519bfef2855acb5c70 100644
--- a/charts/k8s-linkup/templates/service.yaml
+++ b/charts/k8s-linkup/templates/service.yaml
@@ -16,6 +16,7 @@ spec:
       name: {{ .name }}
     {{- end }}
   selector:
+    aleksis.edugit.io/k8s-linkup-name: {{ .name }}
     {{- include "k8s-linkup.selectorLabels" $ | nindent 4 }}
 ---
 {{- end }}