diff --git a/README.md b/README.md
index e1af1797..0ff93313 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ The following components will be installed in your [k3s](https://k3s.io/) cluste
 - [ingress-nginx](https://kubernetes.github.io/ingress-nginx/) - Kubernetes ingress controller used for a HTTP reverse proxy of Kubernetes ingresses
 - [local-path-provisioner](https://github.com/rancher/local-path-provisioner) - provision persistent local storage with Kubernetes
 
-_Additional applications include [hajimari](https://github.com/toboshii/hajimari), [error-pages](https://github.com/tarampampam/error-pages), [echo-server](https://github.com/Ealenn/Echo-Server), [system-upgrade-controller](https://github.com/rancher/system-upgrade-controller), [reflector](https://github.com/emberstack/kubernetes-reflector), [reloader](https://github.com/stakater/Reloader), and [kured](https://github.com/weaveworks/kured)_
+_Additional applications include [hajimari](https://github.com/toboshii/hajimari), [error-pages](https://github.com/tarampampam/error-pages), [echo-server](https://github.com/Ealenn/Echo-Server), [system-upgrade-controller](https://github.com/rancher/system-upgrade-controller), [reloader](https://github.com/stakater/Reloader), and [kured](https://github.com/weaveworks/kured)_
 
 For provisioning the following tools will be used:
 
diff --git a/cluster/apps/default/echo-server/helm-release.yaml b/cluster/apps/default/echo-server/helm-release.yaml
index ec638b56..f9f28928 100644
--- a/cluster/apps/default/echo-server/helm-release.yaml
+++ b/cluster/apps/default/echo-server/helm-release.yaml
@@ -2,19 +2,18 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: &app echo-server
+  name: echo-server
   namespace: default
 spec:
   interval: 15m
   chart:
     spec:
-      chart: kah-common-chart
-      version: 1.2.2
+      chart: app-template
+      version: 0.1.1
       sourceRef:
         kind: HelmRepository
-        name: k8s-at-home
+        name: bjw-s-charts
         namespace: flux-system
-      interval: 15m
   install:
     createNamespace: true
     remediation:
@@ -23,10 +22,8 @@ spec:
     remediation:
       retries: 5
   values:
-    global:
-      nameOverride: *app
     controller:
-      replicas: 1
+      replicas: 3
       strategy: RollingUpdate
     image:
       repository: docker.io/jmalloc/echo-server
@@ -37,18 +34,7 @@ spec:
           http:
             port: &port 8080
     probes:
-      liveness:
-        enabled: true
-        custom: true
-        spec:
-          httpGet:
-            path: /health
-            port: *port
-          initialDelaySeconds: 0
-          periodSeconds: 10
-          timeoutSeconds: 1
-          failureThreshold: 3
-      readiness:
+      liveness: &probes
         enabled: true
         custom: true
         spec:
@@ -59,15 +45,9 @@ spec:
           periodSeconds: 10
           timeoutSeconds: 1
           failureThreshold: 3
+      readiness: *probes
       startup:
-        enabled: true
-        custom: true
-        spec:
-          httpGet:
-            path: /health
-            port: *port
-          failureThreshold: 30
-          periodSeconds: 10
+        enabled: false
     ingress:
       main:
         enabled: true
diff --git a/cluster/apps/kube-system/kustomization.yaml b/cluster/apps/kube-system/kustomization.yaml
index 574d0d3d..4047c969 100644
--- a/cluster/apps/kube-system/kustomization.yaml
+++ b/cluster/apps/kube-system/kustomization.yaml
@@ -6,5 +6,4 @@ resources:
   - cert-manager
   # - kured
   - metrics-server
-  - reflector
   - reloader
diff --git a/cluster/apps/kube-system/reflector/helm-release.yaml b/cluster/apps/kube-system/reflector/helm-release.yaml
deleted file mode 100644
index 8e1e12fa..00000000
--- a/cluster/apps/kube-system/reflector/helm-release.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
-  name: reflector
-  namespace: kube-system
-spec:
-  interval: 15m
-  chart:
-    spec:
-      chart: reflector
-      version: 6.1.47
-      sourceRef:
-        kind: HelmRepository
-        name: emberstack
-        namespace: flux-system
-      interval: 15m
-  install:
-    createNamespace: true
-    remediation:
-      retries: 5
-  upgrade:
-    remediation:
-      retries: 5
-  values:
-    configuration:
-      logging:
-        minimumLevel: Debug
diff --git a/cluster/apps/kube-system/reflector/kustomization.yaml b/cluster/apps/kube-system/reflector/kustomization.yaml
deleted file mode 100644
index 2fa2de20..00000000
--- a/cluster/apps/kube-system/reflector/kustomization.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - helm-release.yaml
diff --git a/cluster/charts/k8s-at-home.yaml b/cluster/charts/bjw-s.yaml
similarity index 68%
rename from cluster/charts/k8s-at-home.yaml
rename to cluster/charts/bjw-s.yaml
index e5af3f2b..c9e6c2d4 100644
--- a/cluster/charts/k8s-at-home.yaml
+++ b/cluster/charts/bjw-s.yaml
@@ -2,8 +2,8 @@
 apiVersion: source.toolkit.fluxcd.io/v1beta2
 kind: HelmRepository
 metadata:
-  name: k8s-at-home
+  name: bjw-s
   namespace: flux-system
 spec:
   interval: 1h
-  url: https://k8s-at-home.com/charts/
+  url: https://bjw-s.github.io/helm-charts/
diff --git a/cluster/charts/emberstack.yaml b/cluster/charts/emberstack.yaml
deleted file mode 100644
index d211ff7e..00000000
--- a/cluster/charts/emberstack.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-apiVersion: source.toolkit.fluxcd.io/v1beta2
-kind: HelmRepository
-metadata:
-  name: emberstack
-  namespace: flux-system
-spec:
-  interval: 1h
-  url: https://emberstack.github.io/helm-charts/
diff --git a/cluster/charts/kustomization.yaml b/cluster/charts/kustomization.yaml
index 43afd97f..2fced7f6 100644
--- a/cluster/charts/kustomization.yaml
+++ b/cluster/charts/kustomization.yaml
@@ -2,12 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - bitnami.yaml
-  - emberstack.yaml
+  - bjw-s.yaml
   - external-dns.yaml
   - hajimari.yaml
   - ingress-nginx.yaml
   - jetstack.yaml
-  - k8s-at-home.yaml
   - k8s-gateway.yaml
   - metallb.yaml
   - metrics-server.yaml