diff --git a/opa/Dockerfile b/opa/Dockerfile
index b25cc0e2d..a762e731e 100644
--- a/opa/Dockerfile
+++ b/opa/Dockerfile
@@ -86,11 +86,10 @@ WORKDIR /opa
 RUN <<EOF
 # Unfortunately, we need to create a dummy Git repository to allow cyclonedx-gomod to determine the version of OPA
 git init
-git add go.mod
-git config --global user.email "dummy@stackable.tech"
-git config --global user.name "dummy"
-git commit -m "dummy"
-git tag "${PRODUCT}"
+git config user.email "fake.commiter@stackable.tech"
+git config user.name "Fake commiter"
+git commit --allow-empty --message "Fake commit, so that we can create a tag"
+git tag "v${PRODUCT}"
 go build -o opa -buildmode=exe
 ~/go/bin/cyclonedx-gomod app -json -output-version 1.5 -output "opa_${PRODUCT}.cdx.json" -packages -files
 EOF
diff --git a/statsd_exporter/Dockerfile b/statsd_exporter/Dockerfile
index a64efe36a..2a0e97e88 100644
--- a/statsd_exporter/Dockerfile
+++ b/statsd_exporter/Dockerfile
@@ -32,11 +32,10 @@ curl "https://repo.stackable.tech/repository/packages/statsd_exporter/statsd_exp
 
   # Unfortunately, we need to create a dummy Git repository to allow cyclonedx-gomod to determine the version of statsd_exporter
   git init
-  git add go.mod
-  git config --global user.email "dummy@stackable.tech"
-  git config --global user.name "dummy"
-  git commit -m "dummy"
-  git tag "${PRODUCT}"
+  git config user.email "fake.commiter@stackable.tech"
+  git config user.name "Fake commiter"
+  git commit --allow-empty --message "Fake commit, so that we can create a tag"
+  git tag "v${PRODUCT}"
   go build -o ../statsd_exporter
   $GOPATH/bin/cyclonedx-gomod app -json -output-version 1.5 -output ../statsd_exporter-${PRODUCT}.cdx.json -packages -files
 )