diff --git a/recipes-kf5/tier2/kauth.inc b/recipes-kf5/tier2/kauth.inc
--- a/recipes-kf5/tier2/kauth.inc
+++ b/recipes-kf5/tier2/kauth.inc
@@ -7,7 +7,7 @@
 
 DEPENDS = "qtbase kcoreaddons"
 
-GIT_REPO = "git://anongit.kde.org/kauth"
+SRC_URI = "git://anongit.kde.org/kauth;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
diff --git a/recipes-kf5/tier2/kauth_5.0.0.bb b/recipes-kf5/tier2/kauth_5.0.0.bb
deleted file mode 100644
--- a/recipes-kf5/tier2/kauth_5.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${GIT_REPO}"
-SRCREV = "63abc315ec9bea4860e2600913d59e4c288cc418"
-PV = "5.0.0"
diff --git a/recipes-kf5/tier2/kauth_5.36.0.bb b/recipes-kf5/tier2/kauth_5.36.0.bb
new file mode 100644
--- /dev/null
+++ b/recipes-kf5/tier2/kauth_5.36.0.bb
@@ -0,0 +1,2 @@
+require ${PN}.inc
+SRCREV = "v${PV}"
diff --git a/recipes-kf5/tier2/kcrash.inc b/recipes-kf5/tier2/kcrash.inc
--- a/recipes-kf5/tier2/kcrash.inc
+++ b/recipes-kf5/tier2/kcrash.inc
@@ -5,9 +5,9 @@
     "
 PR = "r0"
 
-DEPENDS = "kcoreaddons kwindowsystem"
+DEPENDS = "kcoreaddons kwindowsystem kcoreaddons-native"
 
-GIT_REPO = "git://anongit.kde.org/kcrash"
+SRC_URI = "git://anongit.kde.org/kcrash"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
diff --git a/recipes-kf5/tier2/kcrash_5.0.0.bb b/recipes-kf5/tier2/kcrash_5.0.0.bb
deleted file mode 100644
--- a/recipes-kf5/tier2/kcrash_5.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${GIT_REPO}"
-SRCREV = "6fd5c71b0b949f92ab8d2f0f71d700ba729de7ca"
-PV = "5.0.0"
diff --git a/recipes-kf5/tier2/kcrash_5.36.0.bb b/recipes-kf5/tier2/kcrash_5.36.0.bb
new file mode 100644
--- /dev/null
+++ b/recipes-kf5/tier2/kcrash_5.36.0.bb
@@ -0,0 +1,2 @@
+require ${PN}.inc
+SRCREV = "v${PV}"
diff --git a/recipes-kf5/tier2/kjobwidgets.inc b/recipes-kf5/tier2/kjobwidgets.inc
--- a/recipes-kf5/tier2/kjobwidgets.inc
+++ b/recipes-kf5/tier2/kjobwidgets.inc
@@ -5,9 +5,9 @@
     "
 PR = "r0"
 
-DEPENDS = "qtbase kcoreaddons kwidgetsaddons"
+DEPENDS = "qtbase kcoreaddons kwidgetsaddons kcoreaddons-native"
 
-GIT_REPO = "git://anongit.kde.org/kjobwidgets"
+SRC_URI = "git://anongit.kde.org/kjobwidgets;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
diff --git a/recipes-kf5/tier2/kjobwidgets_5.0.0.bb b/recipes-kf5/tier2/kjobwidgets_5.0.0.bb
deleted file mode 100644
--- a/recipes-kf5/tier2/kjobwidgets_5.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${GIT_REPO}"
-SRCREV = "511abe938b2937eb12ab588be81430b17e70da8a"
-PV = "5.0.0"
diff --git a/recipes-kf5/tier2/kjobwidgets_5.36.0.bb b/recipes-kf5/tier2/kjobwidgets_5.36.0.bb
new file mode 100644
--- /dev/null
+++ b/recipes-kf5/tier2/kjobwidgets_5.36.0.bb
@@ -0,0 +1,2 @@
+require ${PN}.inc
+SRCREV = "v${PV}"
diff --git a/recipes-kf5/tier2/kpty.inc b/recipes-kf5/tier2/kpty.inc
--- a/recipes-kf5/tier2/kpty.inc
+++ b/recipes-kf5/tier2/kpty.inc
@@ -5,12 +5,14 @@
     "
 PR = "r0"
 
-DEPENDS = "ki18n kcoreaddons"
+DEPENDS = "ki18n kcoreaddons kcoreaddons-native"
 
-GIT_REPO = "git://anongit.kde.org/kpty"
+SRC_URI = "git://anongit.kde.org/kpty;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
+inherit gettext
+inherit python3native
 
 FILES_${PN}-dev += " \
     ${libdir}/cmake/KF5Pty/*.cmake \
diff --git a/recipes-kf5/tier2/kpty_5.0.0.bb b/recipes-kf5/tier2/kpty_5.0.0.bb
deleted file mode 100644
--- a/recipes-kf5/tier2/kpty_5.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${GIT_REPO}"
-SRCREV = "9ad950b78394e737bd0a03e207cc701ed4d17790"
-PV = "5.0.0"
diff --git a/recipes-kf5/tier2/kpty_5.36.0.bb b/recipes-kf5/tier2/kpty_5.36.0.bb
new file mode 100644
--- /dev/null
+++ b/recipes-kf5/tier2/kpty_5.36.0.bb
@@ -0,0 +1,2 @@
+require ${PN}.inc
+SRCREV = "v${PV}"
diff --git a/recipes-kf5/tier2/kunitconversion.inc b/recipes-kf5/tier2/kunitconversion.inc
--- a/recipes-kf5/tier2/kunitconversion.inc
+++ b/recipes-kf5/tier2/kunitconversion.inc
@@ -7,10 +7,12 @@
 
 DEPENDS = "qtbase ki18n"
 
-GIT_REPO = "git://anongit.kde.org/kunitconversion"
+SRC_URI = "git://anongit.kde.org/kunitconversion;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
+inherit python3native
+inherit gettext
 
 FILES_${PN}-dev += " \
     ${libdir}/cmake/KF5UnitConversion/*.cmake \
diff --git a/recipes-kf5/tier2/kunitconversion_5.0.0.bb b/recipes-kf5/tier2/kunitconversion_5.0.0.bb
deleted file mode 100644
--- a/recipes-kf5/tier2/kunitconversion_5.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${GIT_REPO}"
-SRCREV = "03faceaf5f0fd9aac0579bb067428ffac9554954"
-PV = "5.0.0"
diff --git a/recipes-kf5/tier2/kunitconversion_5.36.0.bb b/recipes-kf5/tier2/kunitconversion_5.36.0.bb
new file mode 100644
--- /dev/null
+++ b/recipes-kf5/tier2/kunitconversion_5.36.0.bb
@@ -0,0 +1,2 @@
+require ${PN}.inc
+SRCREV = "v${PV}"