diff --git a/elements/amphora-agent/source-repository-amphora-agent b/elements/amphora-agent/source-repository-amphora-agent
index 53684a4761..2f8a0a198b 100644
--- a/elements/amphora-agent/source-repository-amphora-agent
+++ b/elements/amphora-agent/source-repository-amphora-agent
@@ -1,3 +1,3 @@
 # This is used for source-based builds
-amphora-agent git /opt/amphora-agent https://opendev.org/openstack/octavia
-upper-constraints file /opt/upper-constraints.txt https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt
+amphora-agent git /opt/amphora-agent https://opendev.org/openstack/octavia stable/train
+upper-constraints file /opt/upper-constraints.txt https://opendev.org/openstack/requirements/raw/branch/stable/train/upper-constraints.txt
diff --git a/releasenotes/notes/fix-amphora-agent-branch-checkout-e2eeb19c6aa09535.yaml b/releasenotes/notes/fix-amphora-agent-branch-checkout-e2eeb19c6aa09535.yaml
new file mode 100644
index 0000000000..996f9f81ce
--- /dev/null
+++ b/releasenotes/notes/fix-amphora-agent-branch-checkout-e2eeb19c6aa09535.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixed an issue where the the amphora image create tool would checkout the
+    master amphora-agent code and master upper constraints.