diff --git a/bb-arm-trusted-firmware-k3-generic-opteed/suite/bullseye/debian/changelog b/bb-arm-trusted-firmware-k3-generic-opteed/suite/bullseye/debian/changelog
index 6369d1fbb56e2ebdc511c7284d0890d5dfbb6c1c..e58c7cbf3d4512ddd61c63c5513673215725a208 100644
--- a/bb-arm-trusted-firmware-k3-generic-opteed/suite/bullseye/debian/changelog
+++ b/bb-arm-trusted-firmware-k3-generic-opteed/suite/bullseye/debian/changelog
@@ -1,6 +1,6 @@
-bb-arm-trusted-firmware-k3-generic-opteed (2.5.20211014.3-0~bullseye+20220107) bullseye; urgency=low
+bb-arm-trusted-firmware-k3-generic-opteed (2.5.20220121.0-0~bullseye+20220121) bullseye; urgency=low
 
   * Rebuild for repos.rcn-ee.com
 
- -- Robert Nelson <robertcnelson@gmail.com>  Fri, 07 Jan 2022 14:08:51 -0600
+ -- Robert Nelson <robertcnelson@gmail.com>  Fri, 21 Jan 2022 11:45:40 -0600
 
diff --git a/bb-arm-trusted-firmware-k3-generic-opteed/suite/bullseye/debian/control b/bb-arm-trusted-firmware-k3-generic-opteed/suite/bullseye/debian/control
index afeb8fa0869eee83a73a89911f61adb018fad8f6..81c3e9c54da9896129e9ea4e7b1b967fe9fbb5bc 100644
--- a/bb-arm-trusted-firmware-k3-generic-opteed/suite/bullseye/debian/control
+++ b/bb-arm-trusted-firmware-k3-generic-opteed/suite/bullseye/debian/control
@@ -2,15 +2,17 @@ Source: bb-arm-trusted-firmware-k3-generic-opteed
 Section: misc
 Priority: extra
 Maintainer: Robert Nelson <robertcnelson@gmail.com>
-Build-Depends:  debhelper (>= 9),
-		ca-certificates,
-		git,
+Build-Depends:
+ debhelper (>= 9)
+ , ca-certificates
+ , git
 Standards-Version: 4.5.1
 Homepage: https://github.com/beagleboard/arm-trusted-firmware
 
 Package: bb-arm-trusted-firmware-k3-generic-opteed
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${shlibs:Depends}
+ , ${misc:Depends}
 Description: BeagleBoard.org Trusted Firmware-A k3-generic-opteed
  BeagleBoard.org Trusted Firmware-A k3-generic-opteed
-
diff --git a/bb-arm-trusted-firmware-k3-generic-opteed/suite/bullseye/debian/rules b/bb-arm-trusted-firmware-k3-generic-opteed/suite/bullseye/debian/rules
index b02df84f05618690c87cc0c551c5d3e5c40c6393..3206c471519e1cdb06c3c59a0fc2c77eb6df5833 100755
--- a/bb-arm-trusted-firmware-k3-generic-opteed/suite/bullseye/debian/rules
+++ b/bb-arm-trusted-firmware-k3-generic-opteed/suite/bullseye/debian/rules
@@ -4,11 +4,13 @@
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
+TAG=bbb.io-08.01.00.006
+
 override_dh_strip:
 	# Just disable for now...
 
 override_dh_auto_configure:
-	git clone -b 08.00.00.004 https://github.com/beagleboard/arm-trusted-firmware --depth=1
+	git clone -b $(TAG) https://github.com/beagleboard/arm-trusted-firmware --depth=1
 	cd ./arm-trusted-firmware/ ; make -j4 CROSS_COMPILE=aarch64-linux-gnu- CFLAGS= LDFLAGS= ARCH=aarch64 PLAT=k3 TARGET_BOARD=generic SPD=opteed all
 
 %:
diff --git a/bb-arm-trusted-firmware-k3-generic-opteed/version.sh b/bb-arm-trusted-firmware-k3-generic-opteed/version.sh
index f920585e1b14871c98d0fbf7a54a7f4fcd145ca5..68ad52ab2d7548b6e3d2bcd58557e8e591e80b48 100644
--- a/bb-arm-trusted-firmware-k3-generic-opteed/version.sh
+++ b/bb-arm-trusted-firmware-k3-generic-opteed/version.sh
@@ -4,7 +4,7 @@
 
 package_name="bb-arm-trusted-firmware-k3-generic-opteed"
 debian_pkg_name="${package_name}"
-package_version="2.5.20211014.3"
+package_version="2.5.20220121.0"
 package_source=""
 src_dir=""
 
@@ -19,4 +19,4 @@ debian_patch=""
 
 clear_changelog="enable"
 
-bullseye_version="~bullseye+20220107"
+bullseye_version="~bullseye+20220121"