diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 5fd44bbe0..c441e3d84 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -91,6 +91,14 @@ jobs:
           kubectl -n helm-system rollout status deploy/helm-controller --timeout=1m
         env:
           KUBEBUILDER_ASSETS: ${{ github.workspace }}/kubebuilder/bin
+      - name: Test samples
+        run: |
+          kubectl create ns samples
+          kubectl -n samples apply -f config/samples
+          kubectl -n samples wait hr/podinfo-ocirepository --for=condition=ready --timeout=4m
+          kubectl -n samples wait hr/podinfo-gitrepository --for=condition=ready --timeout=4m
+          kubectl -n samples wait hr/podinfo-helmrepository --for=condition=ready --timeout=4m
+          kubectl delete ns sample
       - name: Install sources
         run: |
           kubectl -n helm-system apply -f config/testdata/sources
diff --git a/config/samples/helm_v2beta2_helmrelease_gitrepository.yaml b/config/samples/helm_v2_helmrelease_gitrepository.yaml
similarity index 56%
rename from config/samples/helm_v2beta2_helmrelease_gitrepository.yaml
rename to config/samples/helm_v2_helmrelease_gitrepository.yaml
index 0f8d46335..a46a742b2 100644
--- a/config/samples/helm_v2beta2_helmrelease_gitrepository.yaml
+++ b/config/samples/helm_v2_helmrelease_gitrepository.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: podinfo-gitrepository
@@ -10,9 +10,3 @@ spec:
       sourceRef:
         kind: GitRepository
         name: podinfo
-      interval: 1m
-  upgrade:
-    remediation:
-      remediateLastFailure: true
-  test:
-    enable: true
diff --git a/config/samples/helm_v2beta2_helmrelease_helmrepository.yaml b/config/samples/helm_v2_helmrelease_helmrepository.yaml
similarity index 59%
rename from config/samples/helm_v2beta2_helmrelease_helmrepository.yaml
rename to config/samples/helm_v2_helmrelease_helmrepository.yaml
index 06461c1b1..c4c4d1a5d 100644
--- a/config/samples/helm_v2beta2_helmrelease_helmrepository.yaml
+++ b/config/samples/helm_v2_helmrelease_helmrepository.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: podinfo-helmrepository
@@ -11,9 +11,4 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: podinfo
-      interval: 1m
-  upgrade:
-    remediation:
-      remediateLastFailure: true
-  test:
-    enable: true
+      interval: 10m
diff --git a/config/samples/helm_v2_helmrelease_ocirepository.yaml b/config/samples/helm_v2_helmrelease_ocirepository.yaml
new file mode 100644
index 000000000..aafef9c0b
--- /dev/null
+++ b/config/samples/helm_v2_helmrelease_ocirepository.yaml
@@ -0,0 +1,13 @@
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: podinfo-ocirepository
+spec:
+  interval: 5m
+  chartRef:
+    kind: OCIRepository
+    name: podinfo
+  test:
+    enable: true
+  values:
+    replicaCount: 2
diff --git a/config/samples/source_v1beta2_helmrepository.yaml b/config/samples/source_v1_helmrepository.yaml
similarity index 71%
rename from config/samples/source_v1beta2_helmrepository.yaml
rename to config/samples/source_v1_helmrepository.yaml
index c83ef482b..f4f6e3216 100644
--- a/config/samples/source_v1beta2_helmrepository.yaml
+++ b/config/samples/source_v1_helmrepository.yaml
@@ -1,4 +1,4 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta2
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: podinfo
diff --git a/config/samples/source_v1beta2_ocirepository.yaml b/config/samples/source_v1beta2_ocirepository.yaml
new file mode 100644
index 000000000..948512217
--- /dev/null
+++ b/config/samples/source_v1beta2_ocirepository.yaml
@@ -0,0 +1,9 @@
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: OCIRepository
+metadata:
+  name: podinfo
+spec:
+  interval: 1m
+  url: oci://ghcr.io/stefanprodan/charts/podinfo
+  ref:
+    semver: 6.x
diff --git a/docs/api/v2/helm.md b/docs/api/v2/helm.md
index d40b7d902..b9ebff158 100644
--- a/docs/api/v2/helm.md
+++ b/docs/api/v2/helm.md
@@ -2434,7 +2434,7 @@ string
 </div>
 </div>
 <h3 id="helm.toolkit.fluxcd.io/v2.Snapshots">Snapshots
-(<code>[]*github.com/fluxcd/helm-controller/api/v2.Snapshot</code> alias)</h3>
+(<code>[]*./api/v2.Snapshot</code> alias)</h3>
 <p>
 (<em>Appears on:</em>
 <a href="#helm.toolkit.fluxcd.io/v2.HelmReleaseStatus">HelmReleaseStatus</a>)
diff --git a/main.go b/main.go
index 43ceec888..679c8853d 100644
--- a/main.go
+++ b/main.go
@@ -49,7 +49,7 @@ import (
 	sourcev1 "github.com/fluxcd/source-controller/api/v1"
 	sourcev1beta2 "github.com/fluxcd/source-controller/api/v1beta2"
 
-	v2 "github.com/fluxcd/helm-controller/api/v2beta2"
+	v2 "github.com/fluxcd/helm-controller/api/v2"
 	intdigest "github.com/fluxcd/helm-controller/internal/digest"
 
 	// +kubebuilder:scaffold:imports