diff --git a/charts/bazarr/Chart.yaml b/charts/bazarr/Chart.yaml
index 63c2dcd7..afd68215 100644
--- a/charts/bazarr/Chart.yaml
+++ b/charts/bazarr/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v0.9.0.5
 description: Bazarr is a companion application to Sonarr and Radarr. It manages and downloads subtitles based on your requirements
 name: bazarr
-version: 4.0.1
+version: 4.0.2
 keywords:
   - bazarr
   - radarr
@@ -21,4 +21,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.5
+    version: ^1.1.0
diff --git a/charts/jackett/Chart.yaml b/charts/jackett/Chart.yaml
index 44558f34..a63db508 100644
--- a/charts/jackett/Chart.yaml
+++ b/charts/jackett/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v0.16.2106
 description: API Support for your favorite torrent trackers
 name: jackett
-version: 5.0.3
+version: 5.0.4
 keywords:
   - jackett
   - torrent
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.5
+    version: ^1.1.0
diff --git a/charts/lidarr/Chart.yaml b/charts/lidarr/Chart.yaml
index 56b50294..d1843396 100644
--- a/charts/lidarr/Chart.yaml
+++ b/charts/lidarr/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 0.8.0.1886
 description: Looks and smells like Sonarr but made for music
 name: lidarr
-version: 5.0.1
+version: 5.0.2
 keywords:
   - lidarr
   - torrent
@@ -18,4 +18,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.5
+    version: ^1.1.0
diff --git a/charts/nzbget/Chart.yaml b/charts/nzbget/Chart.yaml
index ceb30ab3..6f6bac8c 100644
--- a/charts/nzbget/Chart.yaml
+++ b/charts/nzbget/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v21.0
 description: NZBGet is a Usenet downloader client
 name: nzbget
-version: 6.0.0
+version: 6.0.1
 keywords:
   - nzbget
   - usenet
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.5
+    version: ^1.1.0
diff --git a/charts/nzbhydra2/Chart.yaml b/charts/nzbhydra2/Chart.yaml
index e3b31029..f694b8a2 100644
--- a/charts/nzbhydra2/Chart.yaml
+++ b/charts/nzbhydra2/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v3.4.3
 description: Usenet meta search
 name: nzbhydra2
-version: 4.0.1
+version: 4.0.2
 keywords:
   - nzbhydra2
   - usenet
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.5
+    version: ^1.1.0
diff --git a/charts/ombi/Chart.yaml b/charts/ombi/Chart.yaml
index 73522f45..cb5bc28e 100644
--- a/charts/ombi/Chart.yaml
+++ b/charts/ombi/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 4.0.681
 description: Want a Movie or TV Show on Plex or Emby? Use Ombi!
 name: ombi
-version: 5.0.1
+version: 5.0.2
 keywords:
   - ombi
   - plex
@@ -21,4 +21,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.5
+    version: ^1.1.0
diff --git a/charts/organizr/Chart.yaml b/charts/organizr/Chart.yaml
index 2d5e8772..a10f29d2 100644
--- a/charts/organizr/Chart.yaml
+++ b/charts/organizr/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: latest
 description: HTPC/Homelab Services Organizer
 name: organizr
-version: 2.0.1
+version: 2.0.2
 keywords:
   - organizr
 home: https://github.com/k8s-at-home/charts/tree/master/charts/organizr
@@ -16,4 +16,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.5
+    version: ^1.1.0
diff --git a/charts/qbittorrent/Chart.yaml b/charts/qbittorrent/Chart.yaml
index afece9fe..728be0a9 100644
--- a/charts/qbittorrent/Chart.yaml
+++ b/charts/qbittorrent/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 4.3.0
 description: qBittorrent is a cross-platform free and open-source BitTorrent client
 name: qbittorrent
-version: 6.0.0
+version: 6.0.1
 keywords:
   - qbittorrent
   - torrrent
@@ -16,4 +16,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.5
+    version: ^1.1.0
diff --git a/charts/qbittorrent/templates/configmap.yaml b/charts/qbittorrent/templates/configmap.yaml
index 9cdb5526..7a354849 100644
--- a/charts/qbittorrent/templates/configmap.yaml
+++ b/charts/qbittorrent/templates/configmap.yaml
@@ -5,11 +5,18 @@ metadata:
   labels:
     {{- include "common.labels" . | nindent 4 }}
 data:
-  {{- if and .Values.service.bittorrent .Values.service.bittorrent.port }}
+  {{- /* Determine if the bittorrent port is set somewhere */ -}}
+  {{- $bittorrentPort := "" -}}
+  {{- range $extraServices := .Values.service.additionalServices }}
+    {{- if and .enabled (eq "bittorrent" .nameSuffix) -}}
+      {{- $bittorrentPort = .port.port -}}
+    {{- end }}
+  {{- end }}
+  {{- if $bittorrentPort }}
   31-update-port: |-
     #!/bin/bash
     QBITTORRENT_CONFIGFILE="/config/qBittorrent/qBittorrent.conf"
-    INCOMING_PORT={{- .Values.service.bittorrent.port }}
+    INCOMING_PORT={{- $bittorrentPort }}
 
     incoming_port_exist=$(cat ${QBITTORRENT_CONFIGFILE} | grep -m 1 'Connection\\PortRangeMin='${INCOMING_PORT})
     if [[ -z "${incoming_port_exist}" ]]; then
diff --git a/charts/qbittorrent/templates/service.yaml b/charts/qbittorrent/templates/service.yaml
deleted file mode 100644
index c61c8911..00000000
--- a/charts/qbittorrent/templates/service.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "common.names.fullname" . }}-bittorrent
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-    {{- with .Values.service.bittorrent.labels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
-  {{- with .Values.service.bittorrent.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  type: {{ .Values.service.bittorrent.type }}
-  ports:
-    - name: bittorrent
-      port: {{ .Values.service.bittorrent.port }}
-      protocol: TCP
-      targetPort: {{ .Values.service.bittorrent.port }}
-      {{- if (and (eq .Values.service.bittorrent.type "NodePort") (not (empty .Values.service.bittorrent.nodePort))) }}
-      nodePort: {{ .Values.service.bittorrent.nodePort }}
-      {{- end }}
-  {{- with .Values.service.bittorrent.additionalSpec }}
-  {{- toYaml . | nindent 2 }}
-  {{- end }}
-  selector:
-    {{- include "common.labels.selectorLabels" . | nindent 4 }}
diff --git a/charts/qbittorrent/values.yaml b/charts/qbittorrent/values.yaml
index 83bb3057..1b7b107b 100644
--- a/charts/qbittorrent/values.yaml
+++ b/charts/qbittorrent/values.yaml
@@ -15,20 +15,15 @@ service:
   port:
     port: 8080
 
-  bittorrent:
+  additionalServices:
+  - enabled: true
+    nameSuffix: bittorrent
     type: ClusterIP
-    port: 6881
-    ## Specify the nodePort value for the LoadBalancer and NodePort service types.
-    ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
-    ##
-    # nodePort:
-    ## Provide any additional annotations which may be required. This can be used to
-    ## set the LoadBalancer service type to internal only.
-    ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
-    ##
-    annotations: {}
-    labels: {}
-    additionalSpec: {}
+    port:
+      port: 6881
+      name: bittorrent
+      protocol: TCP
+      targetPort: 6881
 
 persistence:
   config:
diff --git a/charts/radarr/Chart.yaml b/charts/radarr/Chart.yaml
index 804b1763..07eb1fc4 100644
--- a/charts/radarr/Chart.yaml
+++ b/charts/radarr/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 3.0.0.3989
 description: A fork of Sonarr to work with movies à la Couchpotato
 name: radarr
-version: 7.0.1
+version: 7.0.2
 keywords:
   - radarr
   - torrent
@@ -18,4 +18,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.5
+    version: ^1.1.0
diff --git a/charts/sabnzbd/Chart.yaml b/charts/sabnzbd/Chart.yaml
index c23ae85d..ff7d11df 100644
--- a/charts/sabnzbd/Chart.yaml
+++ b/charts/sabnzbd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 3.1.0
 description: Free and easy binary newsreader
 name: sabnzbd
-version: 3.0.1
+version: 3.0.2
 keywords:
   - sabnzbd
   - usenet
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.5
+    version: ^1.1.0
diff --git a/charts/sonarr/Chart.yaml b/charts/sonarr/Chart.yaml
index f0d5b46b..a17e2b0f 100644
--- a/charts/sonarr/Chart.yaml
+++ b/charts/sonarr/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 3.0.4.993
 description: Smart PVR for newsgroup and bittorrent users
 name: sonarr
-version: 7.0.2
+version: 7.0.3
 keywords:
   - sonarr
   - torrent
@@ -18,4 +18,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.5
+    version: ^1.1.0
diff --git a/charts/tautulli/Chart.yaml b/charts/tautulli/Chart.yaml
index 844742b3..f932d808 100644
--- a/charts/tautulli/Chart.yaml
+++ b/charts/tautulli/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v2.6.1
 description: A Python based monitoring and tracking tool for Plex Media Server
 name: tautulli
-version: 5.0.1
+version: 5.0.2
 keywords:
   - tautulli
   - plex
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.5
+    version: ^1.1.0