diff --git a/.cruft.json b/.cruft.json
index f20e4ad..c3f9c90 100644
--- a/.cruft.json
+++ b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/projectsyn/commodore-component-template.git",
-  "commit": "98d16f99766e6c6d97322dbe42e058f0e2bf73d0",
+  "commit": "de1ad5aa829f6a478ba4d245c080056f9305e17e",
   "checkout": "main",
   "context": {
     "cookiecutter": {
@@ -24,7 +24,8 @@
       "github_owner": "projectsyn",
       "github_name": "component-system-upgrade-controller",
       "github_url": "https://github.com/projectsyn/component-system-upgrade-controller",
-      "_template": "https://github.com/projectsyn/commodore-component-template.git"
+      "_template": "https://github.com/projectsyn/commodore-component-template.git",
+      "_commit": "de1ad5aa829f6a478ba4d245c080056f9305e17e"
     }
   },
   "directory": null
diff --git a/Makefile.vars.mk b/Makefile.vars.mk
index b2ad019..024cd64 100644
--- a/Makefile.vars.mk
+++ b/Makefile.vars.mk
@@ -32,7 +32,7 @@ DOCKER_ARGS ?= run --rm -u "$$(id -u):$$(id -g)" --userns=$(DOCKER_USERNS) -w /$
 
 JSONNET_FILES   ?= $(shell find . -type f -not -path './vendor/*' \( -name '*.*jsonnet' -or -name '*.libsonnet' \))
 JSONNETFMT_ARGS ?= --in-place --pad-arrays
-JSONNET_IMAGE   ?= docker.io/bitnami/jsonnet:latest
+JSONNET_IMAGE   ?= ghcr.io/projectsyn/jsonnet:latest
 JSONNET_DOCKER  ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(root_volume) --entrypoint=jsonnetfmt $(JSONNET_IMAGE)
 
 YAMLLINT_ARGS   ?= --no-warnings