diff --git a/conf/layer.conf b/conf/layer.conf
index d694691ab6..50e1b5f66c 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -18,8 +18,3 @@ LAYERDEPENDS_meta-aws += "meta-python"
 
 LAYERSERIES_COMPAT_meta-aws = "kirkstone"
 
-BBFILES_DYNAMIC += " \
-    rust-layer:${LAYERDIR}/dynamic-layers/rust-layer/*/*/*.bb \
-    rust-layer:${LAYERDIR}/dynamic-layers/rust-layer/*/*/*.bbappend \
-    rust-layer:${LAYERDIR}/dynamic-layers/rust-layer/packagegroups/*.bb \
-    "
diff --git a/dynamic-layers/rust-layer/recipes-containers/firecracker/firecracker-0.24.3.inc b/dynamic-layers/rust-layer/recipes-containers/firecracker/firecracker-0.24.3.inc
deleted file mode 100644
index 3e400dfdc7..0000000000
--- a/dynamic-layers/rust-layer/recipes-containers/firecracker/firecracker-0.24.3.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-DEPENDS += "dtc"
-
-SRC_URI += "file://0001-fdt-lib.patch"
diff --git a/recipes-containers/firecracker/firecracker-0.24.3.inc b/recipes-containers/firecracker/firecracker-0.24.3.inc
new file mode 100644
index 0000000000..e2e9f04f92
--- /dev/null
+++ b/recipes-containers/firecracker/firecracker-0.24.3.inc
@@ -0,0 +1,7 @@
+DEPENDS += "dtc"
+
+SRC_URI += "\
+    file://0001-fdt-lib.patch \
+    file://0002-kvm-bindings-use-local-version.patch \
+    file://0003-Remove-abort-panic-from-the-workspace.patch \
+"
diff --git a/dynamic-layers/rust-layer/recipes-containers/firecracker/firecracker.inc b/recipes-containers/firecracker/firecracker.inc
similarity index 100%
rename from dynamic-layers/rust-layer/recipes-containers/firecracker/firecracker.inc
rename to recipes-containers/firecracker/firecracker.inc
diff --git a/dynamic-layers/rust-layer/recipes-containers/firecracker/firecracker/0001-fdt-lib.patch b/recipes-containers/firecracker/firecracker/0001-fdt-lib.patch
similarity index 100%
rename from dynamic-layers/rust-layer/recipes-containers/firecracker/firecracker/0001-fdt-lib.patch
rename to recipes-containers/firecracker/firecracker/0001-fdt-lib.patch
diff --git a/recipes-containers/firecracker/firecracker/0002-kvm-bindings-use-local-version.patch b/recipes-containers/firecracker/firecracker/0002-kvm-bindings-use-local-version.patch
new file mode 100644
index 0000000000..1e1618046a
--- /dev/null
+++ b/recipes-containers/firecracker/firecracker/0002-kvm-bindings-use-local-version.patch
@@ -0,0 +1,23 @@
+From b7600c1ab7f3f08339fa69345de6eb248478a78f Mon Sep 17 00:00:00 2001
+From: nateglims <glimsdal@amazon.com>
+Date: Thu, 19 May 2022 23:38:05 +0000
+Subject: [PATCH] kvm-bindings: use local version
+
+Use the local version of kvm-bindings instead of finding it on github.
+---
+ Cargo.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index f05d00a8..ac01558f 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -10,4 +10,4 @@ panic = "abort"
+ lto = true
+ 
+ [patch.crates-io]
+-kvm-bindings = { git = "https://github.com/firecracker-microvm/kvm-bindings", tag = "v0.3.0-3", features = ["fam-wrappers"] }
++kvm-bindings = { path="../kvm-bindings" , features = ["fam-wrappers"] }
+-- 
+2.25.1
+
diff --git a/recipes-containers/firecracker/firecracker/0003-Remove-abort-panic-from-the-workspace.patch b/recipes-containers/firecracker/firecracker/0003-Remove-abort-panic-from-the-workspace.patch
new file mode 100644
index 0000000000..a0b20f1de7
--- /dev/null
+++ b/recipes-containers/firecracker/firecracker/0003-Remove-abort-panic-from-the-workspace.patch
@@ -0,0 +1,28 @@
+From 96ab5ffcbfab68038aff994eff0a36c4d2a8785a Mon Sep 17 00:00:00 2001
+From: nateglims <glimsdal@amazon.com>
+Date: Fri, 27 May 2022 17:52:02 +0000
+Subject: [PATCH] Remove abort panic from the workspace
+
+---
+ Cargo.toml | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index ac01558f..2fbed68d 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -2,11 +2,7 @@
+ members = ["src/firecracker", "src/jailer"]
+ default-members = ["src/firecracker"]
+ 
+-[profile.dev]
+-panic = "abort"
+-
+ [profile.release]
+-panic = "abort"
+ lto = true
+ 
+ [patch.crates-io]
+-- 
+2.25.1
+
diff --git a/dynamic-layers/rust-layer/recipes-containers/firecracker/firecracker_0.24.3.bb b/recipes-containers/firecracker/firecracker_0.24.3.bb
similarity index 98%
rename from dynamic-layers/rust-layer/recipes-containers/firecracker/firecracker_0.24.3.bb
rename to recipes-containers/firecracker/firecracker_0.24.3.bb
index c80feb77c7..9fc46f9f4b 100644
--- a/dynamic-layers/rust-layer/recipes-containers/firecracker/firecracker_0.24.3.bb
+++ b/recipes-containers/firecracker/firecracker_0.24.3.bb
@@ -105,7 +105,7 @@ SRC_URI += " \
 "
 
 SRCREV_FORMAT .= "_kvm-bindings"
-SRCREV_kvm-bindings = "v0.3.0-3"
+SRCREV_kvm-bindings = "640ea4fd7c9fa3bb6317ce73a68f5792c9f1feef"
 EXTRA_OECARGO_PATHS += "${WORKDIR}/kvm-bindings"
 
 LIC_FILES_CHKSUM = " \
diff --git a/recipes-containers/firecracker/jailer-0.24.3.inc b/recipes-containers/firecracker/jailer-0.24.3.inc
new file mode 100644
index 0000000000..e5936f39fb
--- /dev/null
+++ b/recipes-containers/firecracker/jailer-0.24.3.inc
@@ -0,0 +1,5 @@
+SRC_URI += "\
+    file://0002-kvm-bindings-use-local-version.patch \
+    file://0003-Remove-abort-panic-from-the-workspace.patch \
+"
+
diff --git a/dynamic-layers/rust-layer/recipes-containers/firecracker/jailer.inc b/recipes-containers/firecracker/jailer.inc
similarity index 100%
rename from dynamic-layers/rust-layer/recipes-containers/firecracker/jailer.inc
rename to recipes-containers/firecracker/jailer.inc
diff --git a/recipes-containers/firecracker/jailer/0002-kvm-bindings-use-local-version.patch b/recipes-containers/firecracker/jailer/0002-kvm-bindings-use-local-version.patch
new file mode 100644
index 0000000000..1e1618046a
--- /dev/null
+++ b/recipes-containers/firecracker/jailer/0002-kvm-bindings-use-local-version.patch
@@ -0,0 +1,23 @@
+From b7600c1ab7f3f08339fa69345de6eb248478a78f Mon Sep 17 00:00:00 2001
+From: nateglims <glimsdal@amazon.com>
+Date: Thu, 19 May 2022 23:38:05 +0000
+Subject: [PATCH] kvm-bindings: use local version
+
+Use the local version of kvm-bindings instead of finding it on github.
+---
+ Cargo.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index f05d00a8..ac01558f 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -10,4 +10,4 @@ panic = "abort"
+ lto = true
+ 
+ [patch.crates-io]
+-kvm-bindings = { git = "https://github.com/firecracker-microvm/kvm-bindings", tag = "v0.3.0-3", features = ["fam-wrappers"] }
++kvm-bindings = { path="../kvm-bindings" , features = ["fam-wrappers"] }
+-- 
+2.25.1
+
diff --git a/recipes-containers/firecracker/jailer/0003-Remove-abort-panic-from-the-workspace.patch b/recipes-containers/firecracker/jailer/0003-Remove-abort-panic-from-the-workspace.patch
new file mode 100644
index 0000000000..a0b20f1de7
--- /dev/null
+++ b/recipes-containers/firecracker/jailer/0003-Remove-abort-panic-from-the-workspace.patch
@@ -0,0 +1,28 @@
+From 96ab5ffcbfab68038aff994eff0a36c4d2a8785a Mon Sep 17 00:00:00 2001
+From: nateglims <glimsdal@amazon.com>
+Date: Fri, 27 May 2022 17:52:02 +0000
+Subject: [PATCH] Remove abort panic from the workspace
+
+---
+ Cargo.toml | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index ac01558f..2fbed68d 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -2,11 +2,7 @@
+ members = ["src/firecracker", "src/jailer"]
+ default-members = ["src/firecracker"]
+ 
+-[profile.dev]
+-panic = "abort"
+-
+ [profile.release]
+-panic = "abort"
+ lto = true
+ 
+ [patch.crates-io]
+-- 
+2.25.1
+
diff --git a/dynamic-layers/rust-layer/recipes-containers/firecracker/jailer_0.24.3.bb b/recipes-containers/firecracker/jailer_0.24.3.bb
similarity index 98%
rename from dynamic-layers/rust-layer/recipes-containers/firecracker/jailer_0.24.3.bb
rename to recipes-containers/firecracker/jailer_0.24.3.bb
index a3cb3b1ea8..d629094b85 100644
--- a/dynamic-layers/rust-layer/recipes-containers/firecracker/jailer_0.24.3.bb
+++ b/recipes-containers/firecracker/jailer_0.24.3.bb
@@ -105,7 +105,7 @@ SRC_URI += " \
 "
 
 SRCREV_FORMAT .= "_kvm-bindings"
-SRCREV_kvm-bindings = "v0.3.0-3"
+SRCREV_kvm-bindings = "640ea4fd7c9fa3bb6317ce73a68f5792c9f1feef"
 EXTRA_OECARGO_PATHS += "${WORKDIR}/kvm-bindings"
 
 LIC_FILES_CHKSUM = " \
diff --git a/dynamic-layers/rust-layer/packagegroups/packagegroup-firecracker.bb b/recipes-containers/packagegroups/packagegroup-firecracker.bb
similarity index 100%
rename from dynamic-layers/rust-layer/packagegroups/packagegroup-firecracker.bb
rename to recipes-containers/packagegroups/packagegroup-firecracker.bb