diff --git a/MAINTAINERS b/MAINTAINERS
index b2de50ccfc..8dcce886b8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1452,6 +1452,7 @@ F:	configs/j721s2_hs_evm_r5_defconfig
 TPM DRIVERS
 M:	Ilias Apalodimas <ilias.apalodimas@linaro.org>
 S:	Maintained
+T:	git https://source.denx.de/u-boot/custodians/u-boot-tpm.git
 F:	drivers/tpm/
 
 TQ GROUP
@@ -1461,6 +1462,8 @@ T:	git git://git.denx.de/u-boot-tq-group.git
 
 TEE
 M:	Jens Wiklander <jens.wiklander@linaro.org>
+M:	Ilias Apalodimas <ilias.apalodimas@linaro.org>
+T:	git https://source.denx.de/u-boot/custodians/u-boot-tpm.git
 S:	Maintained
 F:	drivers/tee/
 F:	include/tee.h
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index a813a84a4f..9a9b697e91 100644
--- a/drivers/tee/optee/core.c
+++ b/drivers/tee/optee/core.c
@@ -73,7 +73,7 @@ static struct optee_service *find_service_driver(const struct tee_optee_ta_uuid
 
 	for (idx = 0; idx < service_cnt; idx++, service++) {
 		tee_optee_ta_uuid_to_octets(loc_uuid, &service->uuid);
-		if (!memcmp(uuid, loc_uuid, sizeof(uuid)))
+		if (!memcmp(uuid, loc_uuid, sizeof(*uuid)))
 			return service;
 	}
 
@@ -850,7 +850,7 @@ static int optee_probe(struct udevice *dev)
 		ret = device_bind_driver_to_node(dev, "optee-rng", "optee-rng",
 						 dev_ofnode(dev), NULL);
 		if (ret)
-			dev_warn(dev, "ftpm_tee failed to bind: %d\n", ret);
+			dev_warn(dev, "optee-rng failed to bind: %d\n", ret);
 	}
 
 	return 0;
diff --git a/drivers/tpm/tpm2_ftpm_tee.c b/drivers/tpm/tpm2_ftpm_tee.c
index 3c4c12983d..c61ff2c2af 100644
--- a/drivers/tpm/tpm2_ftpm_tee.c
+++ b/drivers/tpm/tpm2_ftpm_tee.c
@@ -18,10 +18,13 @@
 #include <log.h>
 #include <tpm-v2.h>
 #include <tee.h>
+#include <tee/optee_service.h>
 
 #include "tpm_tis.h"
 #include "tpm2_ftpm_tee.h"
 
+OPTEE_SERVICE_DRIVER(optee_ftpm, TA_FTPM_UUID, "ftpm_tee");
+
 /**
  * ftpm_tee_transceive() - send fTPM commands and retrieve fTPM response.
  * @sendbuf - address of the data to send, byte by byte