diff --git a/recipes-app/greenhouse/greenhouse.bb b/recipes-app/greenhouse/greenhouse.bb
index 29f0d7b..34c849c 100644
--- a/recipes-app/greenhouse/greenhouse.bb
+++ b/recipes-app/greenhouse/greenhouse.bb
@@ -24,8 +24,8 @@ RDEPENDS_${PN} += " \
     python3 \
     python3-gunicorn \
     python3-flask \
-    rpi.gpio \
-    w1thermsensor \
+    python3-rpi.gpio \
+    python3-w1thermsensor \
 "
 
 FILES_${PN} = " \
diff --git a/recipes-app/yardlight/yardlight.bb b/recipes-app/yardlight/yardlight.bb
index 115fb26..03f0682 100644
--- a/recipes-app/yardlight/yardlight.bb
+++ b/recipes-app/yardlight/yardlight.bb
@@ -24,7 +24,7 @@ RDEPENDS_${PN} += "\
     python3 \
     python3-gunicorn \
     python3-flask \
-    rpi.gpio \
+    python3-rpi.gpio \
 "
 
 FILES_${PN} = " \
diff --git a/recipes-core/images/console-dev-image.bb b/recipes-core/images/console-dev-image.bb
index feeff04..a298ec9 100644
--- a/recipes-core/images/console-dev-image.bb
+++ b/recipes-core/images/console-dev-image.bb
@@ -7,8 +7,8 @@ require console-image-base.inc
 DEV_SDK_INSTALL += " \
     git \
     make \
-    python-pip \
-    python-dev \
+    python3-pip \
+    python3-dev \
     bash \
     packagegroup-core-buildessential \
 "
diff --git a/recipes-core/images/console-image-base.inc b/recipes-core/images/console-image-base.inc
index 4de1383..50550b8 100644
--- a/recipes-core/images/console-image-base.inc
+++ b/recipes-core/images/console-image-base.inc
@@ -29,7 +29,7 @@ DEV_SDK_INSTALL = " \
     file \
     perl-modules \
     pkgconfig \
-    python-modules \
+    python3-modules \
  "
 
 EXTRA_TOOLS_INSTALL = " \
@@ -42,7 +42,6 @@ EXTRA_TOOLS_INSTALL = " \
     findutils \
     i2c-tools \
     less \
-    mc \
     procps \
     rsync \
     sysfsutils \
@@ -57,7 +56,6 @@ EXTRA_TOOLS_INSTALL = " \
  "
 
 MQTT = " \
-    python-paho-mqtt \
 "
 
 PYTHON_LIBS = " \
diff --git a/recipes-devtools/rpi.gpio/rpi.gpio_0.7.0.bb b/recipes-devtools/python/python3-rpi.gpio_0.7.0.bb
similarity index 100%
rename from recipes-devtools/rpi.gpio/rpi.gpio_0.7.0.bb
rename to recipes-devtools/python/python3-rpi.gpio_0.7.0.bb
diff --git a/recipes-devtools/w1thermsensor/w1thermsensor_2.0.0.bb b/recipes-devtools/python/python3-w1thermsensor_2.0.0.bb
similarity index 91%
rename from recipes-devtools/w1thermsensor/w1thermsensor_2.0.0.bb
rename to recipes-devtools/python/python3-w1thermsensor_2.0.0.bb
index abd4140..126d7fa 100644
--- a/recipes-devtools/w1thermsensor/w1thermsensor_2.0.0.bb
+++ b/recipes-devtools/python/python3-w1thermsensor_2.0.0.bb
@@ -11,8 +11,6 @@ inherit pypi setuptools3
 
 PYPI_PACKAGE = "w1thermsensor"
 
-# TARGET_CFLAGS += "-fcommon"
-
 RDEPENDS_${PN} = " \
     python3 \
 "