diff --git a/bbmri/modules/feedback-agent-setup.sh b/bbmri/modules/feedback-agent-setup.sh
new file mode 100644
index 0000000..f9217a5
--- /dev/null
+++ b/bbmri/modules/feedback-agent-setup.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+log INFO "######################################### Metadata feedback script was found by Bridgehead"
+
+if [ "$ENABLE_FEEDBACK_AGENT" == true ]; then
+  log INFO "######################################### Metadata feedback setup detected -- will start Feedback service."
+  OVERRIDE+=" -f ./$PROJECT/modules/feedback-agent-compose.yml"
+  FEEDBACK_AGENT_BEAM_SECRET="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"
+  FEEDBACK_AGENT_DB_PASSWORD="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"
+fi
+
diff --git a/bbmri/modules/feedback-agent.md b/bbmri/modules/feedback-agent.md
new file mode 100644
index 0000000..5d5b0ff
--- /dev/null
+++ b/bbmri/modules/feedback-agent.md
@@ -0,0 +1,6 @@
+# Metadata feedback agent
+
+This component can be used to choose the sample to be associated
+with a given piece of metadata (generally the ID of a publication
+relating to research done with the sample).
+