diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.3.bb b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.3.bb
deleted file mode 100644
index d83901f..0000000
--- a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require python-pyparted.inc
-
-inherit distutils3
-
-RDEPENDS_${PN} += "python3-stringold python3-codecs python3-math"
-RDEPENDS_${PN}_class-native = ""
-
-BBCLASSEXTEND = "native"
diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted.inc b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.6.bb
similarity index 70%
rename from meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted.inc
rename to meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.6.bb
index 9705448..63f4933 100644
--- a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted.inc
+++ b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.6.bb
@@ -8,15 +8,18 @@
     file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
     file://src/_pedmodule.c;beginline=10;endline=22;md5=9e53304db812b80d0939e11bb69dcab2 \
 "
+
+SRC_URI[md5sum] = "b85dcaecc3106eb6e9a117270b09615e"
+SRC_URI[sha256sum] = "727ccdf308c194069aa9797f7a6a973bc95b2e407cdf5d58d6c8bc4c9dec92dc"
+
+inherit pypi distutils3
+
 DEPENDS += "parted"
 
-# upstream only publishes releases in github archives which are discouraged
-SRCREV = "481510c10866851844b19f3d2ffcdaa37efc0cf8"
-SRC_URI = "git://github.com/rhinstaller/pyparted.git;protocol=https"
-
-S = "${WORKDIR}/git"
-
 RDEPENDS_${PN}_class-target += " \
     parted (>= 2.3) \
+    python3-stringold python3-codecs python3-math \
 "
 RDEPENDS_${PN}_class-native = ""
+
+BBCLASSEXTEND = "native"
diff --git a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_0.15.0.bb b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_0.15.0.bb
deleted file mode 100644
index abfb8d9..0000000
--- a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_0.15.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require python-pywbem.inc
-inherit setuptools3 update-alternatives
-
-ALTERNATIVE_${PN} = "mof_compiler pywbemcli wbemcli"
-ALTERNATIVE_TARGET[mof_compiler] = "${bindir}/mof_compiler"
-ALTERNATIVE_TARGET[pywbemcli] = "${bindir}/pywbemcli"
-ALTERNATIVE_TARGET[wbemcli] = "${bindir}/wbemcli"
-
-ALTERNATIVE_PRIORITY = "60"
diff --git a/meta-openembedded/meta-python/recipes-extended/pywbem/python-pywbem.inc b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_0.17.3.bb
similarity index 76%
rename from meta-openembedded/meta-python/recipes-extended/pywbem/python-pywbem.inc
rename to meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_0.17.3.bb
index 98508b0..930f048 100644
--- a/meta-openembedded/meta-python/recipes-extended/pywbem/python-pywbem.inc
+++ b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_0.17.3.bb
@@ -16,12 +16,10 @@
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24"
 
-inherit pypi 
+SRC_URI[md5sum] = "9fbee6b4327f035eb212017b6cd84309"
+SRC_URI[sha256sum] = "1de9963adda97d89d191d027ddc64167699a11ac42ecc3ea35dddf7679ac2441"
 
-SRCREV = "b3386b3bee8876d15f0745147c0b08937d8ab18e"
-PYPI_SRC_URI = "git://github.com/pywbem/pywbem;protocol=https;branch=stable_0.15"
-
-S = "${WORKDIR}/git"
+inherit pypi setuptools3 update-alternatives
 
 DEPENDS += " \
     ${PYTHON_PN}-ply-native \
@@ -48,4 +46,11 @@
     ${PYTHON_PN}-xml \
 "
 
+ALTERNATIVE_${PN} = "mof_compiler pywbemcli wbemcli"
+ALTERNATIVE_TARGET[mof_compiler] = "${bindir}/mof_compiler"
+ALTERNATIVE_TARGET[pywbemcli] = "${bindir}/pywbemcli"
+ALTERNATIVE_TARGET[wbemcli] = "${bindir}/wbemcli"
+
+ALTERNATIVE_PRIORITY = "60"
+
 BBCLASSEXTEND = "native"