diff --git a/library/common-test/tests/addons/codeserver_test.yaml b/library/common-test/tests/addons/codeserver_test.yaml
index ed8fefd7..65312387 100644
--- a/library/common-test/tests/addons/codeserver_test.yaml
+++ b/library/common-test/tests/addons/codeserver_test.yaml
@@ -3,9 +3,26 @@ templates:
   - common.yaml
 tests:
   - it: default should pass
+    set:
+      workload: &workload
+        workload-name:
+          enabled: true
+          primary: true
+          type: Deployment
+          podSpec: {}
+      service: &service
+        service-name:
+          enabled: true
+          primary: true
+          ports:
+            main:
+              enabled: true
+              primary: true
+              protocol: http
+              port: 8080
     asserts:
       - hasDocuments:
-          count: 3
+          count: 2
       - documentIndex: 1
         isKind:
           of: Service
@@ -19,6 +36,8 @@ tests:
 
   - it: addon enabled should pass
     set:
+      workload: *workload
+      service: *service
       addons:
         codeserver:
           enabled: true
diff --git a/library/common/templates/addons/vpn/_gluetunContainer.tpl b/library/common/templates/addons/vpn/_gluetunContainer.tpl
index cb273245..09ac7ec3 100644
--- a/library/common/templates/addons/vpn/_gluetunContainer.tpl
+++ b/library/common/templates/addons/vpn/_gluetunContainer.tpl
@@ -7,7 +7,15 @@ The gluetun sidecar container to be inserted.
   podSpec:
     containers:
       gluetun:
+        enabled: true
         imageSelector: gluetunImage
+        probes:
+          liveness:
+            enabled: false
+          readiness:
+            enabled: false
+          startup:
+            enabled: false
         securityContext:
           runAsUser: 568
           runAsGroup: 568
diff --git a/library/common/values.yaml b/library/common/values.yaml
index f9734353..a0afb61b 100644
--- a/library/common/values.yaml
+++ b/library/common/values.yaml
@@ -281,6 +281,12 @@ manifestManager:
   enabled: true
   staging: false
 
+# TODO: Update repo/tag
+gluetunImage:
+  repository: tccr.io/truecharts/gluetun
+  tag: some_tag
+  pullPolicy: IfNotPresent
+
 openvpnImage:
   repository: tccr.io/truecharts/openvpn-client
   tag: latest@sha256:1f83decdf614cbf48e2429921b6f0efa0e825f447f5c510b65bc90f660227688