diff --git a/br-ext/package/optee_client/S30optee b/br-ext/package/optee_client/S30optee
index df6129fbfaa704c47630c1a06680fc3fd9d02a80..7f7afca38ea70727c01c51e1799689b94985cfd4 100755
--- a/br-ext/package/optee_client/S30optee
+++ b/br-ext/package/optee_client/S30optee
@@ -19,6 +19,10 @@ case "$1" in
 			chown root:ion /dev/ion && chmod 0660 /dev/ion
 			[ $? = 0 ] && echo "OK" || echo "FAIL"
 		fi
+		printf "Create and set permissions on /data... "
+		mkdir -p /data/tee && chown -R tee:tee /data/tee && \
+			chmod 0770 /data/tee
+		[ $? = 0 ] && echo "OK" || echo "FAIL"
 		printf "Starting tee-supplicant... "
 		su tee -c '/usr/sbin/tee-supplicant -d'
 		[ $? = 0 ] && echo "OK" || echo "FAIL"
diff --git a/br-ext/package/optee_client/optee_client.mk b/br-ext/package/optee_client/optee_client.mk
index 18dd799d84794d7587eb86d0b609f72f6dd4033e..9b0b01e8c15478097037bfe510b8f7a97bbbb6e3 100644
--- a/br-ext/package/optee_client/optee_client.mk
+++ b/br-ext/package/optee_client/optee_client.mk
@@ -28,9 +28,4 @@ define OPTEE_CLIENT_USERS
 	test -1 test -1 - - /bin/sh teeclnt,ion Test user, may run TEE client applications
 endef
 
-define OPTEE_CLIENT_PERMISSIONS
-	/data d 755 root root - - - - -
-	/data/tee d 770 tee tee - - - - -
-endef
-
 $(eval $(cmake-package))