diff --git a/helmfile.d/headscale-router.yaml.gotmpl b/helmfile.d/headscale-router.yaml.gotmpl
index d10d4530..9227e1b7 100644
--- a/helmfile.d/headscale-router.yaml.gotmpl
+++ b/helmfile.d/headscale-router.yaml.gotmpl
@@ -2,8 +2,9 @@ bases:
  - ../envs/environments.yaml.gotmpl
 
 repositories:
-- name: headscale
-  url: https://charts.gabe565.com
+- name: gabe565
+  oci: true
+  url: ghcr.io/gabe565/charts
 
 commonLabels:
   tier: system
@@ -11,7 +12,7 @@ commonLabels:
 releases:
 - name: headscale-router
   namespace: headscale
-  chart: headscale/headscale
+  chart: gabe565/headscale
   condition: headscale.enabled
   values:
   - ../values/headscale-router/values/values.yaml
diff --git a/helmfile.d/headscale.yaml.gotmpl b/helmfile.d/headscale.yaml.gotmpl
index b59bc78e..e59ace39 100644
--- a/helmfile.d/headscale.yaml.gotmpl
+++ b/helmfile.d/headscale.yaml.gotmpl
@@ -2,8 +2,9 @@ bases:
  - ../envs/environments.yaml.gotmpl
 
 repositories:
-- name: headscale
-  url: https://charts.gabe565.com
+- name: gabe565
+  oci: true
+  url: ghcr.io/gabe565/charts
 
 commonLabels:
   tier: system
@@ -11,7 +12,7 @@ commonLabels:
 releases:
 - name: headscale
   namespace: headscale
-  chart: headscale/headscale
+  chart: gabe565/headscale
   condition: headscale.enabled
   values:
   - ../values/headscale/values/values.yaml
diff --git a/values/argo/manifests/sys-project.yaml b/values/argo/manifests/sys-project.yaml
index 5ffa450c..1a5d1ee4 100644
--- a/values/argo/manifests/sys-project.yaml
+++ b/values/argo/manifests/sys-project.yaml
@@ -137,6 +137,7 @@ spec:
   - https://chartmuseum.github.io/charts
   - https://dapr.github.io/helm-charts
   - https://charts.gabe565.com
+  - ghcr.io/gabe565/charts
   - https://open-telemetry.github.io/opentelemetry-helm-charts
   - https://ghcr.io/slinkyproject/charts/slurm-operator
   - https://ghcr.io/slinkyproject/charts/slurm-operator-crds