diff --git a/config/recipe-dx.yml b/config/recipe-dx.yml
index 342786c6a3..54daf817ee 100644
--- a/config/recipe-dx.yml
+++ b/config/recipe-dx.yml
@@ -53,5 +53,16 @@ modules:
     scripts:
       - dx-extras.sh
       - networkmanager-realtek.sh
-      - nodisplaylink.sh
-      - 99-bash-umask.sh
+
+  - type: systemd
+    system:
+      enabled:
+        - podman.service
+        - podman.socket
+        - cockpit.service
+        - sshd.service
+      disabled:
+        - displaylink.service
+        - pmie.service
+        - pmlogger.service
+        - waydroid-container.service
diff --git a/config/recipe-main.yml b/config/recipe-main.yml
index 729f099317..ef5895d073 100644
--- a/config/recipe-main.yml
+++ b/config/recipe-main.yml
@@ -35,5 +35,16 @@ modules:
   - type: script
     scripts:
       - networkmanager-realtek.sh
-      - nodisplaylink.sh
-      - 99-bash-umask.sh
+
+  - type: systemd
+    system:
+      enabled:
+        - podman.service
+        - podman.socket
+        - cockpit.service
+        - sshd.service
+      disabled:
+        - displaylink.service
+        - pmie.service
+        - pmlogger.service
+        - waydroid-container.service
diff --git a/config/recipe-nvidia.yml b/config/recipe-nvidia.yml
index fa984f9b61..9febe64edf 100644
--- a/config/recipe-nvidia.yml
+++ b/config/recipe-nvidia.yml
@@ -35,5 +35,17 @@ modules:
   - type: script
     scripts:
       - networkmanager-realtek.sh
-      - nodisplaylink.sh
       - 99-bash-umask.sh
+
+  - type: systemd
+    system:
+      enabled:
+        - podman.service
+        - podman.socket
+        - cockpit.service
+        - sshd.service
+      disabled:
+        - displaylink.service
+        - pmie.service
+        - pmlogger.service
+        - waydroid-container.service