diff --git a/charts/vector-agent/Chart.lock b/charts/vector-agent/Chart.lock
index 5deb32a..090d8fc 100644
--- a/charts/vector-agent/Chart.lock
+++ b/charts/vector-agent/Chart.lock
@@ -2,5 +2,5 @@ dependencies:
 - name: vector-shared
   repository: file://../vector-shared
   version: 0.1.0
-digest: sha256:e5315fe99b2b529ddb674f1a65d85687ffc2c098fc52ededc957932c9462c471
-generated: "2021-07-27T19:10:53.836267-04:00"
+digest: sha256:f80efefe11af3d8d497f3dfb2035864bced30d21856ec2d3b0d64f76966d446d
+generated: "2021-08-11T19:43:04.791899-04:00"
diff --git a/charts/vector-agent/Chart.yaml b/charts/vector-agent/Chart.yaml
index a3a4a65..ae9a6c1 100644
--- a/charts/vector-agent/Chart.yaml
+++ b/charts/vector-agent/Chart.yaml
@@ -3,7 +3,7 @@ name: vector-agent
 type: application
 icon: https://vector.dev/press/vector-icon.svg
 description: A Helm chart to collect Kubernetes logs with Vector
-version: "0.16.0-beta.1"
+version: "0.16.0-beta.2"
 appVersion: "0.15.1"
 home: https://vector.dev/
 sources:
@@ -13,5 +13,5 @@ maintainers:
     email: team-vector@datadoghq.com
 dependencies:
   - name: vector-shared
-    version: "*"
+    version: "~0.1.0"
     repository: file://../vector-shared
diff --git a/charts/vector-agent/charts/vector-shared-0.1.0.tgz b/charts/vector-agent/charts/vector-shared-0.1.0.tgz
index 0e43dc4..9dd1c04 100644
Binary files a/charts/vector-agent/charts/vector-shared-0.1.0.tgz and b/charts/vector-agent/charts/vector-shared-0.1.0.tgz differ
diff --git a/charts/vector-agent/ci/customConfig-values.yaml b/charts/vector-agent/ci/customConfig-values.yaml
new file mode 100644
index 0000000..37ceff0
--- /dev/null
+++ b/charts/vector-agent/ci/customConfig-values.yaml
@@ -0,0 +1,26 @@
+customConfig:
+  data_dir: "/vector-data-dir"
+  sources:
+    host_metrics:
+      type: host_metrics
+      filesystem:
+        devices:
+          excludes: ["binfmt_misc"]
+        filesystems:
+          excludes: ["binfmt_misc"]
+        mountpoints:
+          excludes: ["*/proc/sys/fs/binfmt_misc"]
+    internal_metrics:
+      type: internal_metrics
+    kubernetes_logs:
+      type: kubernetes_logs
+      glob_minimum_cooldown_ms: 5000
+  sinks:
+    prometheus_sink:
+      type: prometheus_exporter
+      inputs: ["*_metrics"]
+      address: 0.0.0.0:9090
+    stdout:
+      type: console
+      inputs: ["*_logs"]
+      encoding: json
diff --git a/charts/vector-agent/ci/default-values.yaml b/charts/vector-agent/ci/default-values.yaml
new file mode 100644
index 0000000..7394e23
--- /dev/null
+++ b/charts/vector-agent/ci/default-values.yaml
@@ -0,0 +1 @@
+# Empty values file for testing default parameters.
diff --git a/charts/vector-agent/ci/rawConfig-values.yaml b/charts/vector-agent/ci/rawConfig-values.yaml
new file mode 100644
index 0000000..dd406e2
--- /dev/null
+++ b/charts/vector-agent/ci/rawConfig-values.yaml
@@ -0,0 +1,7 @@
+sinks:
+  stdout:
+    type: console
+    inputs: ["kubernetes_logs"]
+    rawConfig: |
+      target = "stdout"
+      encoding = "json"
diff --git a/charts/vector-agent/ci/sinks-values.yaml b/charts/vector-agent/ci/sinks-values.yaml
new file mode 100644
index 0000000..46fbd57
--- /dev/null
+++ b/charts/vector-agent/ci/sinks-values.yaml
@@ -0,0 +1,6 @@
+sinks:
+  stdout:
+    type: console
+    inputs: ["kubernetes_logs"]
+    target: stdout
+    encoding: json
diff --git a/charts/vector-aggregator/Chart.lock b/charts/vector-aggregator/Chart.lock
index e4632ef..b47d717 100644
--- a/charts/vector-aggregator/Chart.lock
+++ b/charts/vector-aggregator/Chart.lock
@@ -2,5 +2,5 @@ dependencies:
 - name: vector-shared
   repository: file://../vector-shared
   version: 0.1.0
-digest: sha256:e5315fe99b2b529ddb674f1a65d85687ffc2c098fc52ededc957932c9462c471
-generated: "2021-07-27T19:11:08.362594-04:00"
+digest: sha256:f80efefe11af3d8d497f3dfb2035864bced30d21856ec2d3b0d64f76966d446d
+generated: "2021-08-11T19:43:00.799809-04:00"
diff --git a/charts/vector-aggregator/Chart.yaml b/charts/vector-aggregator/Chart.yaml
index c946dcc..a7c7cf7 100644
--- a/charts/vector-aggregator/Chart.yaml
+++ b/charts/vector-aggregator/Chart.yaml
@@ -3,7 +3,7 @@ name: vector-aggregator
 type: application
 icon: https://vector.dev/press/vector-icon.svg
 description: A Helm chart to aggregate data with Vector
-version: "0.16.0-beta.1"
+version: "0.16.0-beta.2"
 appVersion: "0.15.1"
 home: https://vector.dev/
 sources:
@@ -13,5 +13,5 @@ maintainers:
     email: team-vector@datadoghq.com
 dependencies:
   - name: vector-shared
-    version: "*"
+    version: "~0.1.0"
     repository: file://../vector-shared
diff --git a/charts/vector-aggregator/charts/vector-shared-0.1.0.tgz b/charts/vector-aggregator/charts/vector-shared-0.1.0.tgz
index 72d3343..e264ee0 100644
Binary files a/charts/vector-aggregator/charts/vector-shared-0.1.0.tgz and b/charts/vector-aggregator/charts/vector-shared-0.1.0.tgz differ
diff --git a/charts/vector-aggregator/ci/default-values.yaml b/charts/vector-aggregator/ci/default-values.yaml
new file mode 100644
index 0000000..7394e23
--- /dev/null
+++ b/charts/vector-aggregator/ci/default-values.yaml
@@ -0,0 +1 @@
+# Empty values file for testing default parameters.
diff --git a/charts/vector-aggregator/ci/haproxy-values.yaml b/charts/vector-aggregator/ci/haproxy-values.yaml
new file mode 100644
index 0000000..b88e7f5
--- /dev/null
+++ b/charts/vector-aggregator/ci/haproxy-values.yaml
@@ -0,0 +1,2 @@
+haproxy:
+  enabled: true
diff --git a/charts/vector/Chart.yaml b/charts/vector/Chart.yaml
index 09c55cc..627a67a 100644
--- a/charts/vector/Chart.yaml
+++ b/charts/vector/Chart.yaml
@@ -3,7 +3,7 @@ name: vector
 type: application
 icon: https://vector.dev/press/vector-icon.svg
 description: A Helm chart for Vector observability stack
-version: "0.16.0-beta.1"
+version: "0.16.0-beta.2"
 appVersion: "0.15.1"
 home: https://vector.dev/
 sources:
diff --git a/charts/vector/ci/default-values.yaml b/charts/vector/ci/default-values.yaml
new file mode 100644
index 0000000..7394e23
--- /dev/null
+++ b/charts/vector/ci/default-values.yaml
@@ -0,0 +1 @@
+# Empty values file for testing default parameters.
diff --git a/charts/vector/ci/haproxy-values.yaml b/charts/vector/ci/haproxy-values.yaml
new file mode 100644
index 0000000..cfea209
--- /dev/null
+++ b/charts/vector/ci/haproxy-values.yaml
@@ -0,0 +1,12 @@
+global:
+  vector:
+    commonEnvKV:
+      VECTOR_REQUIRE_HEALTHY: true
+
+vector-agent:
+  vectorSink:
+    host: "vector-aggregator-haproxy"
+
+vector-aggregator:
+  haproxy:
+    enabled: true