diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_6.33.6.bb b/meta-oe/recipes-devtools/protobuf/protobuf_35.1.bb
similarity index 92%
rename from meta-oe/recipes-devtools/protobuf/protobuf_6.33.6.bb
rename to meta-oe/recipes-devtools/protobuf/protobuf_35.1.bb
index 880dd82b1d..dd3f364de2 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf_6.33.6.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf_35.1.bb
@@ -10,21 +10,20 @@ LIC_FILES_CHKSUM = " \
     file://third_party/utf8_range/LICENSE;md5=d4974d297231477b2ff507c35d61c13c \
 "
 
-PROTOC_VERSION = "v${@d.getVar('PV').split('.', 1)[1]}"
-PROTOC_BRANCH = "${@d.getVar('PV').split('.', 2)[1]}.x"
+PROTOC_BRANCH = "${@d.getVar('PV').split('.')[0]}.x"
 
 DEPENDS = "zlib abseil-cpp jsoncpp"
 DEPENDS:append:class-target = " protobuf-native"
 
-SRCREV = "6e1998413a5bca7c058b85999667893f167434bc"
+SRCREV = "35cd01f9fe9afbeea38cc7b979a3b6bfcde82c03"
 
-SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=${PROTOC_BRANCH};protocol=https;tag=${PROTOC_VERSION} \
+SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=${PROTOC_BRANCH};protocol=https;tag=v${PV} \
            file://run-ptest \
            file://0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch \
            file://0001-fix-protobuf-native-build-failure-with-gcc-10.patch \
            "
 
-UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d\.\d+\.\d+)"
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d\.\d+)"
 
 CVE_PRODUCT = "google:protobuf protobuf:protobuf google-protobuf protobuf-cpp"
 
@@ -39,7 +38,7 @@ PACKAGECONFIG:class-nativesdk ?= "compiler"
 PACKAGECONFIG[python] = ",,"
 PACKAGECONFIG[compiler] = "-Dprotobuf_BUILD_PROTOC_BINARIES=ON,-Dprotobuf_BUILD_PROTOC_BINARIES=OFF"
 
-EXTRA_OECMAKE += "\
+EXTRA_OECMAKE:class-target = "\
     -Dprotobuf_BUILD_SHARED_LIBS=ON \
     -Dprotobuf_BUILD_LIBPROTOC=ON \
     -Dprotobuf_BUILD_TESTS=OFF \
@@ -100,6 +99,14 @@ do_compile_ptest() {
 	export PKG_CONFIG_SYSROOT_DIR=$save_pkg_config_sysroot_dir
 }
 
+do_install:append:class-native() {
+    rm -rf ${D}${libdir} ${D}${includedir}
+}
+
+do_install:append:class-nativesdk() {
+    rm -rf ${D}${libdir} ${D}${includedir}
+}
+
 do_install_ptest() {
 	local olddir=`pwd`