diff --git a/meta-forgefirm/recipes-forgefirm/forgectrl/forgectrl.bb b/meta-forgefirm/recipes-forgefirm/forgectrl/forgectrl.bb
index 00acc4e..471efb8 100644
--- a/meta-forgefirm/recipes-forgefirm/forgectrl/forgectrl.bb
+++ b/meta-forgefirm/recipes-forgefirm/forgectrl/forgectrl.bb
@@ -7,10 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=19ed4e3e8c28a4311c16b0b2b91357ec"
 PE = "1"
 PV = "0.1.0"
 
-SRC_URI = "git://github.com/ScottW514/forgectrl.git;protocol=https;branch=cloud-action-surface"
+SRC_URI = "git://github.com/ScottW514/forgectrl.git;protocol=https;branch=main"
 # Pinned; bump deliberately after pushing forgectrl changes.
-# TEST-image pin to the cloud-action-surface branch (controller_mode=cloud +
-# the compatibility banner); repoint to main after the branch is merged.
 SRCREV = "0d57cbfe183d037c7e239854bcb66c6cdc672bb0"
 
 S = "${WORKDIR}/git"
diff --git a/meta-forgefirm/recipes-forgefirm/forgefirm-app/forgefirm-app.inc b/meta-forgefirm/recipes-forgefirm/forgefirm-app/forgefirm-app.inc
index ebc2484..0e1c59b 100644
--- a/meta-forgefirm/recipes-forgefirm/forgefirm-app/forgefirm-app.inc
+++ b/meta-forgefirm/recipes-forgefirm/forgefirm-app/forgefirm-app.inc
@@ -6,9 +6,9 @@ HOMEPAGE = "https://github.com/ScottW514/python3-gfhardware"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=62f8bb455fcc4bf177ecab380f71cd5d"
 
-SRC_URI = "git://github.com/ScottW514/python3-gfhardware.git;protocol=https;branch=cloud-action-surface"
+SRC_URI = "git://github.com/ScottW514/python3-gfhardware.git;protocol=https;branch=master"
 # Pinned; bump deliberately (AUTOREV is not reproducible).
-SRCREV = "7ea88246fabe1142a1bb728dffce8799a71fa846"
+SRCREV = "ec8c2de4453b997af0b524d334c7130e1d31c2ad"
 
 PV = "0.1.0+git"