diff --git a/build-scripts/patches/moonray/0001-Moonray.patch b/build-scripts/patches/moonray/0001-Moonray.patch
index 7226438e91..b2688f29cc 100644
--- a/build-scripts/patches/moonray/0001-Moonray.patch
+++ b/build-scripts/patches/moonray/0001-Moonray.patch
@@ -1,14 +1,115 @@
-From de526e476d051fbc5ec4cfbec383a60729434159 Mon Sep 17 00:00:00 2001
+From 484078565e4b048cccb268cbe020d11c77dba438 Mon Sep 17 00:00:00 2001
 From: Benjamin Schimke <benjamin.schimke@canonical.com>
 Date: Wed, 5 Jun 2024 09:48:57 +0200
 Subject: [PATCH] Moonray
 
 ---
+ src/k8s/hack/dynamic-go-build.sh                    | 2 +-
+ src/k8s/hack/dynamic-go-install.sh                  | 2 +-
+ src/k8s/hack/dynamic-go-test.sh                     | 2 +-
+ src/k8s/hack/dynamic-go-vet.sh                      | 2 +-
+ src/k8s/hack/static-go-build.sh                     | 2 +-
+ src/k8s/hack/static-go-install.sh                   | 2 +-
+ src/k8s/hack/static-go-test.sh                      | 2 +-
+ src/k8s/hack/static-go-vet.sh                       | 2 +-
  src/k8s/pkg/k8sd/features/implementation_default.go | 1 +
- 1 file changed, 1 insertion(+)
+ 9 files changed, 9 insertions(+), 8 deletions(-)
 
+diff --git a/src/k8s/hack/dynamic-go-build.sh b/src/k8s/hack/dynamic-go-build.sh
+index 4d0b886..bc2e2a9 100755
+--- a/src/k8s/hack/dynamic-go-build.sh
++++ b/src/k8s/hack/dynamic-go-build.sh
+@@ -5,6 +5,6 @@ DIR="$(realpath `dirname "${0}"`)"
+ . "${DIR}/dynamic-dqlite.sh"
+ 
+ go build \
+-  -tags dqlite,libsqlite3 \
++  -tags dqlite,libsqlite3,moonray \
+   -ldflags '-s -w' \
+   "${@}"
+diff --git a/src/k8s/hack/dynamic-go-install.sh b/src/k8s/hack/dynamic-go-install.sh
+index 8fbef01..4297b96 100755
+--- a/src/k8s/hack/dynamic-go-install.sh
++++ b/src/k8s/hack/dynamic-go-install.sh
+@@ -5,6 +5,6 @@ DIR="$(realpath `dirname "${0}"`)"
+ . "${DIR}/dynamic-dqlite.sh"
+ 
+ go install \
+-  -tags dqlite,libsqlite3 \
++  -tags dqlite,libsqlite3,moonray \
+   -ldflags '-s -w' \
+   "${@}"
+diff --git a/src/k8s/hack/dynamic-go-test.sh b/src/k8s/hack/dynamic-go-test.sh
+index 17aa33f..943302f 100755
+--- a/src/k8s/hack/dynamic-go-test.sh
++++ b/src/k8s/hack/dynamic-go-test.sh
+@@ -5,5 +5,5 @@ DIR="$(realpath `dirname "${0}"`)"
+ . "${DIR}/dynamic-dqlite.sh"
+ 
+ go test \
+-  -tags dqlite,libsqlite3 \
++  -tags dqlite,libsqlite3,moonray \
+   "${@}"
+diff --git a/src/k8s/hack/dynamic-go-vet.sh b/src/k8s/hack/dynamic-go-vet.sh
+index 43b79fa..bd5955c 100755
+--- a/src/k8s/hack/dynamic-go-vet.sh
++++ b/src/k8s/hack/dynamic-go-vet.sh
+@@ -5,5 +5,5 @@ DIR="$(realpath `dirname "${0}"`)"
+ . "${DIR}/static-dqlite.sh"
+ 
+ go vet \
+-  -tags dqlite,libsqlite3 \
++  -tags dqlite,libsqlite3,moonray \
+   "${@}"
+diff --git a/src/k8s/hack/static-go-build.sh b/src/k8s/hack/static-go-build.sh
+index 1672df6..fd871d0 100755
+--- a/src/k8s/hack/static-go-build.sh
++++ b/src/k8s/hack/static-go-build.sh
+@@ -5,6 +5,6 @@ DIR="$(realpath `dirname "${0}"`)"
+ . "${DIR}/static-dqlite.sh"
+ 
+ go build \
+-  -tags dqlite,libsqlite3 \
++  -tags dqlite,libsqlite3,moonray \
+   -ldflags '-s -w -linkmode "external" -extldflags "-static"' \
+   "${@}"
+diff --git a/src/k8s/hack/static-go-install.sh b/src/k8s/hack/static-go-install.sh
+index f42ca89..942a4eb 100755
+--- a/src/k8s/hack/static-go-install.sh
++++ b/src/k8s/hack/static-go-install.sh
+@@ -5,6 +5,6 @@ DIR="$(realpath `dirname "${0}"`)"
+ . "${DIR}/static-dqlite.sh"
+ 
+ go install \
+-  -tags dqlite,libsqlite3 \
++  -tags dqlite,libsqlite3,moonray \
+   -ldflags '-s -w -linkmode "external" -extldflags "-static"' \
+   "${@}"
+diff --git a/src/k8s/hack/static-go-test.sh b/src/k8s/hack/static-go-test.sh
+index cb94ca3..e608609 100755
+--- a/src/k8s/hack/static-go-test.sh
++++ b/src/k8s/hack/static-go-test.sh
+@@ -5,6 +5,6 @@ DIR="$(realpath `dirname "${0}"`)"
+ . "${DIR}/static-dqlite.sh"
+ 
+ go test \
+-  -tags dqlite,libsqlite3 \
++  -tags dqlite,libsqlite3,moonray \
+   -ldflags '-linkmode "external" -extldflags "-static"' \
+   "${@}"
+diff --git a/src/k8s/hack/static-go-vet.sh b/src/k8s/hack/static-go-vet.sh
+index 43b79fa..bd5955c 100755
+--- a/src/k8s/hack/static-go-vet.sh
++++ b/src/k8s/hack/static-go-vet.sh
+@@ -5,5 +5,5 @@ DIR="$(realpath `dirname "${0}"`)"
+ . "${DIR}/static-dqlite.sh"
+ 
+ go vet \
+-  -tags dqlite,libsqlite3 \
++  -tags dqlite,libsqlite3,moonray \
+   "${@}"
 diff --git a/src/k8s/pkg/k8sd/features/implementation_default.go b/src/k8s/pkg/k8sd/features/implementation_default.go
-index aac2d97..313a7f5 100644
+index aeb1729..4d69ce2 100644
 --- a/src/k8s/pkg/k8sd/features/implementation_default.go
 +++ b/src/k8s/pkg/k8sd/features/implementation_default.go
 @@ -12,6 +12,7 @@ import (