diff --git a/meta-forgefirm/conf/distro/forgefirm.conf b/meta-forgefirm/conf/distro/forgefirm.conf
index 438ed8e..e6a888f 100644
--- a/meta-forgefirm/conf/distro/forgefirm.conf
+++ b/meta-forgefirm/conf/distro/forgefirm.conf
@@ -4,6 +4,6 @@ DISTRO = "forgefirm"
 DISTRO_NAME = "OpenGlow/ForgeFIRM"
 DISTRO_VERSION = "0.0.0"
 
-DISTRO_FEATURES_remove = " \
+DISTRO_FEATURES:remove = " \
   3g alsa avahi bluetooth bluez5 ext2 ipv6 irda nfc nfs opengl pci pcmcia \
   pulseaudio vulkan wayland x11 zeroconf "
diff --git a/meta-forgefirm/conf/layer.conf b/meta-forgefirm/conf/layer.conf
index e7c658d..b9d7c63 100644
--- a/meta-forgefirm/conf/layer.conf
+++ b/meta-forgefirm/conf/layer.conf
@@ -13,4 +13,4 @@ BBFILE_PRIORITY_forgefirm-layer = "10"
 # cause compatibility issues with other layers
 LAYERVERSION_forgefirm-layer = "1"
 
-LAYERSERIES_COMPAT_forgefirm-layer = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_forgefirm-layer = "scarthgap"
diff --git a/meta-forgefirm/recipes-extended/uflius/ulfius_git.bb b/meta-forgefirm/recipes-extended/uflius/ulfius_git.bb
index f3e6f65..6a35723 100644
--- a/meta-forgefirm/recipes-extended/uflius/ulfius_git.bb
+++ b/meta-forgefirm/recipes-extended/uflius/ulfius_git.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/babelouest/ulfius"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=40d2542b8c43a3ec2b7f5da31a697b88"
 
-SRC_URI = "git://github.com/babelouest/ulfius"
+SRC_URI = "git://github.com/babelouest/ulfius;protocol=https;branch=master"
 SRCREV = "${AUTOREV}"
 
 S = "${WORKDIR}/git"
@@ -12,7 +12,7 @@ S = "${WORKDIR}/git"
 inherit cmake pkgconfig
 
 # For some reason, this package wants to install headers from other packages
-# do_install_append() {
+# do_install:append() {
 #   rm -f ${D}${includedir}/orcania.h
 #   rm -f ${D}${includedir}/orcania-cfg.h
 #   rm -f ${D}${includedir}/yder.h
@@ -20,6 +20,6 @@ inherit cmake pkgconfig
 # }
 
 DEPENDS = "gnutls jansson libmicrohttpd"
-RDEPENDS_${PN} = "gnutls jansson libmicrohttpd"
+RDEPENDS:${PN} = "gnutls jansson libmicrohttpd"
 
 EXTRA_OECMAKE += "-DWITH_JOURNALD=off"
diff --git a/meta-forgefirm/recipes-forgefirm/forgectrl/forgectrl.bb b/meta-forgefirm/recipes-forgefirm/forgectrl/forgectrl.bb
index b635169..6e73ebf 100644
--- a/meta-forgefirm/recipes-forgefirm/forgectrl/forgectrl.bb
+++ b/meta-forgefirm/recipes-forgefirm/forgectrl/forgectrl.bb
@@ -14,6 +14,6 @@ S = "${WORKDIR}"
 inherit cmake
 
 DEPENDS += "libconfig ulfius"
-RDEPENDS_${PN} = "libconfig ulfius"
+RDEPENDS:${PN} = "libconfig ulfius"
 
 EXTRA_OECMAKE = ""
diff --git a/meta-forgefirm/recipes-forgefirm/images/forgefirm-image-dev.bb b/meta-forgefirm/recipes-forgefirm/images/forgefirm-image-dev.bb
index 3145b0a..a88cc45 100644
--- a/meta-forgefirm/recipes-forgefirm/images/forgefirm-image-dev.bb
+++ b/meta-forgefirm/recipes-forgefirm/images/forgefirm-image-dev.bb
@@ -6,7 +6,7 @@ IMAGE_INSTALL += " \
   forgectrl \
 "
 
-IMAGE_INSTALL_remove = " \
+IMAGE_INSTALL:remove = " \
   gfui-client \
 "