diff --git a/.github/workflows/build-canary-chart.yaml b/.github/workflows/build-canary-chart.yaml
index ae507d2..97759d7 100644
--- a/.github/workflows/build-canary-chart.yaml
+++ b/.github/workflows/build-canary-chart.yaml
@@ -48,7 +48,6 @@ jobs:
       chart: charts/canary
       test-command: |
         helm template $CHART \
-          --values charts/canary/values.yaml \
           --include-crds \
           --name-template canary \
           --namespace canary \
diff --git a/.github/workflows/build-canary-crds-chart.yaml b/.github/workflows/build-canary-crds-chart.yaml
index 05afc93..2f87386 100644
--- a/.github/workflows/build-canary-crds-chart.yaml
+++ b/.github/workflows/build-canary-crds-chart.yaml
@@ -1,11 +1,11 @@
-name: Build Canary CRDS Chart
+name: Build Canary CRDs Chart
 
 on:
   pull_request:
     # Only consider PRs that change files for this asset, including ci scripts
     paths:
       - '.github/workflows/build-canary-crds-chart.yaml'
-      - 'charts/canary/**'
+      - 'charts/canary-crds/**'
     # Make sure all workflows that are "required checks" for a given
     # branch protection rule have the same paths: and branches-ignore:
     # filters. Otherwise, you can end up in a deadlock waiting on a
@@ -17,7 +17,7 @@ on:
     # Only consider pushes that change files for this asset, including ci scripts
     paths:
       - '.github/workflows/build-canary-crds-chart.yaml'
-      - 'charts/canary/**'
+      - 'charts/canary-crds/**'
 
 permissions:
   contents: write
@@ -42,15 +42,14 @@ jobs:
       registry: ${{ vars.HARBOR_REGISTRY }}
       registry-user: ${{ vars.HARBOR_USER }}
       registry-project: ${{ vars.HARBOR_PROJECT }}
-      registry-repo: canary
+      registry-repo: canary-crds
       release-tag-format: 'canary-crds-chart-${version}'
       cosign-public-key: ${{ vars.COSIGN_PUBLIC_KEY }}
-      chart: charts/canary/charts/crds
+      chart: charts/canary-crds
       test-command: |
         helm template $CHART \
-          --values charts/canary/charts/crds/values.yaml \
           --include-crds \
-          --name-template canary \
+          --name-template canary-crds \
           --namespace canary \
           --create-namespace \
           --debug
diff --git a/charts/canary/charts/crds/.helmignore b/charts/canary-crds/.helmignore
similarity index 100%
rename from charts/canary/charts/crds/.helmignore
rename to charts/canary-crds/.helmignore
diff --git a/charts/canary-crds/Chart.yaml b/charts/canary-crds/Chart.yaml
new file mode 100644
index 0000000..3d192c6
--- /dev/null
+++ b/charts/canary-crds/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+appVersion: 1.0.0
+description: Canary HTTP Monitor CRDs
+name: canary-crds
+type: application
+version: 1.0.0
diff --git a/charts/canary/charts/crds/crds/http-monitor.yaml b/charts/canary-crds/crds/http-monitor.yaml
similarity index 100%
rename from charts/canary/charts/crds/crds/http-monitor.yaml
rename to charts/canary-crds/crds/http-monitor.yaml
diff --git a/charts/canary/charts/crds/values.yaml b/charts/canary-crds/values.yaml
similarity index 100%
rename from charts/canary/charts/crds/values.yaml
rename to charts/canary-crds/values.yaml
diff --git a/charts/canary/Chart.yaml b/charts/canary/Chart.yaml
index cc2baa7..47e0e25 100644
--- a/charts/canary/Chart.yaml
+++ b/charts/canary/Chart.yaml
@@ -4,7 +4,3 @@ description: Canary HTTP Monitor
 name: canary
 type: application
 version: 1.0.0
-dependencies:
-  - name: crds
-    version: "0.0.0"
-    condition: crds.enabled
diff --git a/charts/canary/charts/crds/Chart.yaml b/charts/canary/charts/crds/Chart.yaml
deleted file mode 100644
index adb9e4a..0000000
--- a/charts/canary/charts/crds/Chart.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-apiVersion: v2
-name: crds
-version: 0.0.0
diff --git a/charts/canary/values.yaml b/charts/canary/values.yaml
index 23939a3..c2c262c 100644
--- a/charts/canary/values.yaml
+++ b/charts/canary/values.yaml
@@ -1,6 +1,3 @@
-crds:
-  enabled: true
-
 podMonitor:
   enabled: true