diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1df12f6..c082d2f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,6 @@ build-image:
   parallel:
     matrix:
       - RECIPE:
-          - recipe-jp-desktop.yml
           - recipe-jp-desktop-gaming.yml
           - recipe-jp-laptop.yml
           - recipe-cp-laptop.yml
diff --git a/config/dev-packages.yml b/config/dev-packages.yml
index 978d2e7..aa4fe96 100644
--- a/config/dev-packages.yml
+++ b/config/dev-packages.yml
@@ -1,4 +1,5 @@
 modules:
+  - from-file: docker-engine.yml
   - type: script
     scripts:
       - install-mkcert.sh
@@ -12,7 +13,6 @@ modules:
       - cmake
       - virt-manager
       - "gcc-c++"
-      - docker
       - earthly
       - kubectl
       - helm
diff --git a/config/docker-engine.yml b/config/docker-engine.yml
new file mode 100644
index 0000000..4e96c64
--- /dev/null
+++ b/config/docker-engine.yml
@@ -0,0 +1,14 @@
+modules:
+- type: rpm-ostree
+  repos:
+    - https://download.docker.com/linux/fedora/docker-ce.repo
+  install:
+    - docker-ce
+    - docker-ce-cli
+    - containerd.io
+    - docker-buildx-plugin 
+    - docker-compose-plugin
+- type: systemd
+  system:
+    enabled:
+    - docker.service
diff --git a/config/recipe-jp-desktop-gaming.yml b/config/recipe-jp-desktop-gaming.yml
index cdd1c0c..ef9408c 100644
--- a/config/recipe-jp-desktop-gaming.yml
+++ b/config/recipe-jp-desktop-gaming.yml
@@ -10,4 +10,4 @@ modules:
       - desktop-audio: /usr
   - from-file: jp-apps.yml
   - from-file: dev-packages.yml
-  - from-file: r2modman.yml
+  # - from-file: r2modman.yml
diff --git a/config/recipe-jp-desktop.yml b/config/recipe-jp-desktop.yml
index e2c2647..a563a4b 100644
--- a/config/recipe-jp-desktop.yml
+++ b/config/recipe-jp-desktop.yml
@@ -10,11 +10,5 @@ modules:
       - 8bitdo-ultimate: /usr
       - steam-firewall: /usr
       - desktop-audio: /usr
-  - type: containerfile
-    snippets:
-      - COPY --from=registry.gitlab.com/wunker-bunker/xboxdrv-docker /usr/local/bin/xboxdrv /usr/bin/xboxdrv
-      - COPY --from=registry.gitlab.com/wunker-bunker/xboxdrv-docker /usr/local/bin/xboxdrvctl /usr/bin/xboxdrvctl
-      - COPY --from=registry.gitlab.com/wunker-bunker/xboxdrv-docker /usr/local/share/man/man1/xboxdrv.1 /usr/share/man/man1/xboxdrv.1
   - from-file: jp-apps.yml
   - from-file: dev-packages.yml
-  - from-file: r2modman.yml
diff --git a/config/scripts/install-r2modman.sh b/config/scripts/install-r2modman.sh
index 4a379f6..775a07b 100755
--- a/config/scripts/install-r2modman.sh
+++ b/config/scripts/install-r2modman.sh
@@ -11,7 +11,7 @@ VERSION=${LATEST_TAG#v}
 echo "Latest version is $VERSION"
 
 # Download the latest version of the r2modman package
-curl -L https://github.com/ebkr/r2modmanPlus/releases/download/v${VERSION}/r2modman-${VERSION}.x86_64.rpm -o r2modman-${VERSION}.x86_64.rpm
+curl -L0 https://github.com/ebkr/r2modmanPlus/releases/download/v${VERSION}/r2modman-${VERSION}.x86_64.rpm -o r2modman-${VERSION}.x86_64.rpm
 
 # Install the downloaded package
 rpm-ostree install r2modman-${VERSION}.x86_64.rpm