diff --git a/config/r2modman.yml b/config/r2modman.yml
deleted file mode 100644
index a88f896..0000000
--- a/config/r2modman.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-modules:
-  - type: rpm-ostree
-    optfix:
-      - r2modman
-  - type: script
-    scripts:
-      - install-r2modman.sh
diff --git a/config/recipe-jp-desktop-gaming.yml b/config/recipe-jp-desktop-gaming.yml
index ef9408c..a494491 100644
--- a/config/recipe-jp-desktop-gaming.yml
+++ b/config/recipe-jp-desktop-gaming.yml
@@ -10,4 +10,5 @@ modules:
       - desktop-audio: /usr
   - from-file: jp-apps.yml
   - from-file: dev-packages.yml
-  # - from-file: r2modman.yml
+  - type: r2modman
+    version: 3.1.47
diff --git a/config/scripts/install-r2modman.sh b/modules/r2modman/r2modman.sh
old mode 100755
new mode 100644
similarity index 53%
rename from config/scripts/install-r2modman.sh
rename to modules/r2modman/r2modman.sh
index 775a07b..78dfe3c
--- a/config/scripts/install-r2modman.sh
+++ b/modules/r2modman/r2modman.sh
@@ -1,17 +1,18 @@
 #!/usr/bin/env bash
 
-set -xeuo pipefail
+set -euo pipefail
 
-# Fetch the latest tag from the GitHub repository
-LATEST_TAG=$(curl -s https://api.github.com/repos/ebkr/r2modmanPlus/tags | jq -r '.[0].name')
+VERSION=$(echo $1 | jq -r .version)
 
-# Extract the version number from the tag
-VERSION=${LATEST_TAG#v}
-
-echo "Latest version is $VERSION"
+echo "Installing R2modman Plus v${VERSION}"
 
 # Download the latest version of the r2modman package
 curl -L0 https://github.com/ebkr/r2modmanPlus/releases/download/v${VERSION}/r2modman-${VERSION}.x86_64.rpm -o r2modman-${VERSION}.x86_64.rpm
 
+mkdir -p "/var/opt"
+ln -s "/var/opt"  "/opt"
+mkdir -p "/usr/lib/opt/r2modman"
+ln -s "../../usr/lib/opt/r2modman" "/var/opt/r2modman"
 # Install the downloaded package
 rpm-ostree install r2modman-${VERSION}.x86_64.rpm
+