diff --git a/flux2/apps/nextcloud/release.yaml b/flux2/apps/nextcloud/release.yaml
index 85601730d3066a3a25532dae0fa7acd8d52d05c2..c28947635dba999847fbb2db8c677dbcc4cd6651 100644
--- a/flux2/apps/nextcloud/release.yaml
+++ b/flux2/apps/nextcloud/release.yaml
@@ -8,10 +8,11 @@ spec:
   releaseName: nc
   chart:
     spec:
-      chart: .
-      # NOTE: Change the GitRepository yaml file if you want a different version
+      # renovate: registryUrl=https://open.greenhost.net/api/v4/projects/1/packages/helm/stable
+      chart: nextcloud-onlyoffice
+      version: 0.5.4
       sourceRef:
-        kind: GitRepository
+        kind: HelmRepository
         name: nextcloud
         namespace: flux-system
   interval: 1h
diff --git a/flux2/apps/wekan/release.yaml b/flux2/apps/wekan/release.yaml
index a79a1cc2199eef2c24bc25d2c91a21dbb8be2a2a..09dec070c305d08644a4550c0b59cc631bfad8e5 100644
--- a/flux2/apps/wekan/release.yaml
+++ b/flux2/apps/wekan/release.yaml
@@ -8,10 +8,11 @@ spec:
   releaseName: wekan
   chart:
     spec:
-      chart: helm/wekan
-      # NOTE: Change the GitRepository yaml file if you want a different version
+      # renovate: registryUrl=https://wekan.github.io/charts/
+      chart: wekan
+      version: 1.1.0
       sourceRef:
-        kind: GitRepository
+        kind: HelmRepository
         name: wekan
         namespace: flux-system
   interval: 1h
diff --git a/flux2/apps/wordpress/release.yaml b/flux2/apps/wordpress/release.yaml
index 0d2651e119104a03d4ffd12f62af0a876e36b311..c503d13fdb6c11b0ab9e5a3fb80f0f0abcb66cdd 100644
--- a/flux2/apps/wordpress/release.yaml
+++ b/flux2/apps/wordpress/release.yaml
@@ -8,11 +8,12 @@ spec:
   releaseName: wordpress
   chart:
     spec:
-      chart: .
-      # NOTE: Change the GitRepository yaml file if you want a different version
+      # renovate: registryUrl=https://open.greenhost.net/api/v4/projects/27/packages/helm/stable
+      chart: wordpress
+      version: 0.4.3
       sourceRef:
-        kind: GitRepository
-        name: wordpress
+        kind: HelmRepository
+        name: wordpress-helm
         namespace: flux-system
   interval: 1h
   install:
diff --git a/flux2/core/base/dashboard/dashboard-release.yaml b/flux2/core/base/dashboard/dashboard-release.yaml
index 42112f55365af81e907d5fd70cb2417dd74ffc2b..0f1e3447446749dbe6a11543a18099c0f9952f95 100644
--- a/flux2/core/base/dashboard/dashboard-release.yaml
+++ b/flux2/core/base/dashboard/dashboard-release.yaml
@@ -10,10 +10,11 @@ spec:
     - name: single-sign-on
   chart:
     spec:
-      chart: ./deployment/helmchart/
-      # NOTE: Change the GitRepository yaml file if you want a different version
+      # renovate: registryUrl=https://open.greenhost.net/api/v4/projects/48/packages/helm/stable
+      chart: stackspin-dashboard
+      version: 0.1.1
       sourceRef:
-        kind: GitRepository
+        kind: HelmRepository
         name: dashboard
         namespace: flux-system
   interval: 1h
diff --git a/flux2/core/base/local-path-provisioner/release.yaml b/flux2/core/base/local-path-provisioner/release.yaml
index cd3d2a7fea591cf29e1479fe4af06f112f64f65b..2406670b6039254fd766821a4bdfe0b45cf754b8 100644
--- a/flux2/core/base/local-path-provisioner/release.yaml
+++ b/flux2/core/base/local-path-provisioner/release.yaml
@@ -7,9 +7,11 @@ spec:
   releaseName: local-path-provisioner
   chart:
     spec:
-      chart: ./deploy/chart
+      # renovate: registryUrl=https://open.greenhost.net/api/v4/projects/44/packages/helm/stable
+      chart: local-path-provisioner
+      version: 0.0.20
       sourceRef:
-        kind: GitRepository
+        kind: HelmRepository
         name: local-path-provisioner
         namespace: flux-system
   interval: 1h0m0s
diff --git a/flux2/core/base/sources/dashboard.yaml b/flux2/core/base/sources/dashboard.yaml
index e1358201759b14f16f216d86a7b0fa09b9c1bdda..744cbb151638ada76944f95b4f7d13d5595dae0d 100644
--- a/flux2/core/base/sources/dashboard.yaml
+++ b/flux2/core/base/sources/dashboard.yaml
@@ -1,11 +1,11 @@
 ---
 apiVersion: source.toolkit.fluxcd.io/v1beta1
-kind: GitRepository
+kind: HelmRepository
 metadata:
   name: dashboard
-  namespace: stackspin
+  namespace: flux-system
 spec:
+  # The interval at which to check the upstream for updates
   interval: 1h
-  url: https://open.greenhost.net/stackspin/dashboard
-  ref:
-    tag: chart-0.1.1
+  # The repository URL, can be a HTTP/S or SSH address
+  url: https://open.greenhost.net/api/v4/projects/48/packages/helm/stable
diff --git a/flux2/core/base/sources/local-path-provisioner.yaml b/flux2/core/base/sources/local-path-provisioner.yaml
index 2082907ba8a4fc773f379edbac036f5e0b55a972..c76d232fdb8ee094e5a26d682dcaeb5d31833bc8 100644
--- a/flux2/core/base/sources/local-path-provisioner.yaml
+++ b/flux2/core/base/sources/local-path-provisioner.yaml
@@ -1,6 +1,6 @@
 ---
 apiVersion: source.toolkit.fluxcd.io/v1beta1
-kind: GitRepository
+kind: HelmRepository
 metadata:
   name: local-path-provisioner
   namespace: flux-system
@@ -8,13 +8,4 @@ spec:
   # The interval at which to check the upstream for updates
   interval: 1h
   # The repository URL, can be a HTTP/S or SSH address
-  #
-  # We need to use our own fork of the local-path-provisioner until
-  # https://github.com/rancher/local-path-provisioner/issues/85 is resolved
-  url: https://open.greenhost.net/stackspin/local-path-provisioner
-  # The Git reference to checkout and monitor for changes
-  # (defaults to master)
-  # For all available options, see:
-  # https://toolkit.fluxcd.io/components/source/api/#source.toolkit.fluxcd.io/v1beta1.GitRepositoryRef
-  ref:
-    tag: v0.0.20-gh1
+  url: https://open.greenhost.net/api/v4/projects/44/packages/helm/stable
diff --git a/flux2/core/base/sources/nextcloud.yaml b/flux2/core/base/sources/nextcloud.yaml
index 95c54e09f79c3e6b458aec6b1b4721024377a5e3..fc4f46a0551bd1c48968042b025065e93897afa5 100644
--- a/flux2/core/base/sources/nextcloud.yaml
+++ b/flux2/core/base/sources/nextcloud.yaml
@@ -1,6 +1,6 @@
 ---
 apiVersion: source.toolkit.fluxcd.io/v1beta1
-kind: GitRepository
+kind: HelmRepository
 metadata:
   name: nextcloud
   namespace: flux-system
@@ -8,10 +8,4 @@ spec:
   # The interval at which to check the upstream for updates
   interval: 1h
   # The repository URL, can be a HTTP/S or SSH address
-  url: https://open.greenhost.net/stackspin/nextcloud
-  # The Git reference to checkout and monitor for changes
-  # (defaults to master)
-  # For all available options, see:
-  # https://toolkit.fluxcd.io/components/source/api/#source.toolkit.fluxcd.io/v1beta1.GitRepositoryRef
-  ref:
-    tag: 0.5.1
+  url: https://open.greenhost.net/api/v4/projects/1/packages/helm/stable
diff --git a/flux2/core/base/sources/wekan.yaml b/flux2/core/base/sources/wekan.yaml
index 408c77194dc48fc9017c2c72457f32a856071b2a..0d40941ed3f666763391c772016f162daaabf56a 100644
--- a/flux2/core/base/sources/wekan.yaml
+++ b/flux2/core/base/sources/wekan.yaml
@@ -1,16 +1,11 @@
 ---
 apiVersion: source.toolkit.fluxcd.io/v1beta1
-kind: GitRepository
+kind: HelmRepository
 metadata:
   name: wekan
   namespace: flux-system
 spec:
   # The interval at which to check the upstream for updates
   interval: 1h
-  url: https://github.com/wekan/wekan
-  # The Git reference to checkout and monitor for changes
-  # (defaults to master)
-  # For all available options, see:
-  # https://toolkit.fluxcd.io/components/source/api/#source.toolkit.fluxcd.io/v1beta1.GitRepositoryRef
-  ref:
-    tag: "v5.63"
+  # The repository URL, can be a HTTP/S or SSH address
+  url: https://wekan.github.io/charts/
diff --git a/flux2/core/base/sources/wordpress.yaml b/flux2/core/base/sources/wordpress.yaml
index 3d4209e9d7c09775ead7e410f1f91ece2a82a76e..06c652978824473817b9580f1a88bf554f58eac6 100644
--- a/flux2/core/base/sources/wordpress.yaml
+++ b/flux2/core/base/sources/wordpress.yaml
@@ -1,17 +1,11 @@
 ---
 apiVersion: source.toolkit.fluxcd.io/v1beta1
-kind: GitRepository
+kind: HelmRepository
 metadata:
-  name: wordpress
+  name: wordpress-helm
   namespace: flux-system
 spec:
   # The interval at which to check the upstream for updates
   interval: 1h
   # The repository URL, can be a HTTP/S or SSH address
-  url: https://open.greenhost.net/stackspin/wordpress-helm
-  # The Git reference to checkout and monitor for changes
-  # (defaults to master)
-  # For all available options, see:
-  # https://toolkit.fluxcd.io/components/source/api/#source.toolkit.fluxcd.io/v1beta1.GitRepositoryRef
-  ref:
-    tag: 0.4.2
+  url: https://open.greenhost.net/api/v4/projects/27/packages/helm/stable