diff --git a/recipes/common/dev-packages-bootc.yml b/recipes/common/dev-packages-bootc.yml
index 2247005..91ab92f 100644
--- a/recipes/common/dev-packages-bootc.yml
+++ b/recipes/common/dev-packages-bootc.yml
@@ -1,7 +1,6 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
 modules:
-  - from-file: common/docker-engine.yml
   - type: dnf
     source: local
     repos:
@@ -9,8 +8,17 @@ modules:
       - google-cloud-sdk.repo
       - https://pkg.earthly.dev/earthly.repo
       - https://cli.github.com/packages/rpm/gh-cli.repo
+      - https://download.docker.com/linux/fedora/docker-ce.repo
+    group-install:
+      packages:
+        - development-tools
     install:
       packages:
+        - docker-ce
+        - docker-ce-cli
+        - containerd.io
+        - docker-buildx-plugin 
+        - docker-compose-plugin
         - cmake
         - "gcc-c++"
         - earthly
@@ -34,6 +42,10 @@ modules:
         - zlib-devel
         - glab
         - hugo
+  - type: systemd
+    system:
+      enabled:
+      - docker.service
   - type: script
     scripts:
       - install-mkcert.sh
diff --git a/recipes/common/jp-packages-bootc.yml b/recipes/common/jp-packages-bootc.yml
index 82af335..6f1103e 100644
--- a/recipes/common/jp-packages-bootc.yml
+++ b/recipes/common/jp-packages-bootc.yml
@@ -1,9 +1,6 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
 modules:
-  - type: script
-    snippets:
-      - rpm --import https://brave-browser-rpm-release.s3.brave.com/brave-core.asc
   - type: dnf
     source: local
     optfix:
@@ -11,6 +8,8 @@ modules:
     repos:
       - https://pkgs.tailscale.com/stable/fedora/tailscale.repo
       - https://brave-browser-rpm-release.s3.brave.com/brave-browser.repo
+    keys:
+      - https://brave-browser-rpm-release.s3.brave.com/brave-core.asc
     install:
       packages:
         - libadwaita