diff --git a/CHANGELOG.md b/CHANGELOG.md
index 468f1686..0295f722 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,8 @@
 
 ### Changed
 
+- Switch to go-jsonnet and use released version `v0.20.0` in the container image. ([#25](https://gitlab.eclipse.org/eclipsefdn/security/otterdog/-/issues/25))
+- Use released version `v0.5.1` of `jsonnet-bundler` in the container image. ([#24](https://gitlab.eclipse.org/eclipsefdn/security/otterdog/-/issues/24))
 - Update some repo settings after creation as they are not taken correctly into account during creation by GitHub.
 - Include all organization settings when doing a rest call to update specific settings to ensure consistency. ([#14](https://gitlab.eclipse.org/eclipsefdn/security/otterdog/-/issues/14))
 - Added special handling for `web_commit_signoff_required`: if changed organization wide, it will implicitly change the same setting on repo level.
diff --git a/Dockerfile b/Dockerfile
index fb8a8f9c..a5ca7ff6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
-# build jsonnet-bundler using a go environment
+# build go-jsonnet and jsonnet-bundler using a go environment
 FROM docker.io/library/golang:1.18 AS builder-go
-RUN go install -a github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb@latest
+RUN go install -a github.com/google/go-jsonnet/cmd/jsonnet@v0.20.0
+RUN go install -a github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb@v0.5.1
 
 # build otterdog using a python environment
 FROM docker.io/library/python:3.10.10-slim as builder-python3
@@ -31,8 +32,7 @@ RUN apt-get update \
         jq \
         pass \
         curl \
-        unzip \
-        jsonnet
+        unzip
 
 ARG BW_VERSION
 ARG BW_RELEASE
@@ -42,6 +42,7 @@ ENV BW_RELEASE=${BW_RELEASE}
 RUN cd /tmp/ && curl -k -L -O https://github.com/bitwarden/clients/releases/download/${BW_RELEASE}/${BW_VERSION} \
     && unzip /tmp/${BW_VERSION} -d /usr/bin/ && rm -rf /tmp/${BW_VERSION}
 
+COPY --from=builder-go /go/bin/jsonnet /usr/bin/jsonnet
 COPY --from=builder-go /go/bin/jb /usr/bin/jb
 COPY --from=builder-python3 /app/.venv /app/.venv
 COPY --from=builder-python3 /app/otterdog /app/otterdog
diff --git a/README.md b/README.md
index a5e4719e..c8ec45d9 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,8 @@
 ### System requirements:
 
 * python3.10 (mandatory): install using `apt install python3`
-* jsonnet (mandatory): install using `apt install jsonnet`
-* jsonnet-bundler (mandatory): install using `go install -a github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb@latest`
+* jsonnet (mandatory): install using `go install -a github.com/google/go-jsonnet/cmd/jsonnet@v0.20.0`
+* jsonnet-bundler (mandatory): install using `go install -a github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb@v0.5.1`
 * bitwarden cli tool (optional): install using `snap install bw`
 * pass cli tool (optional): install using `apt install pass`
 * Installing poetry