diff --git a/conf/layer.conf b/conf/layer.conf
index 315ba6d..7ddb7de 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -14,6 +14,8 @@ BBFILES_DYNAMIC += " \
     qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bbappend \
     virtualization-layer:${LAYERDIR}/dynamic-layers/virt-layer/*/*/*.bb \
     virtualization-layer:${LAYERDIR}/dynamic-layers/virt-layer/*/*/*.bbappend \
+    openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \
+    openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \
     \
 "
 
diff --git a/recipes-devtools/openocd/openocd_riscv.bb b/dynamic-layers/openembedded-layer/recipes-devtools/openocd/openocd_riscv.bb
similarity index 100%
rename from recipes-devtools/openocd/openocd_riscv.bb
rename to dynamic-layers/openembedded-layer/recipes-devtools/openocd/openocd_riscv.bb