diff --git a/roles/calibre_web/defaults/main.yml b/roles/calibre_web/defaults/main.yml
index 7a628348a8..c386e9021b 100644
--- a/roles/calibre_web/defaults/main.yml
+++ b/roles/calibre_web/defaults/main.yml
@@ -84,10 +84,10 @@ calibre_web_docker_envs_default:
   TZ: "{{ tz }}"
   CACHE_DIR: "/cache/"
   USE_CONFIG_DIR: "true"
-  DOCKER_MODS: linuxserver/calibre-web:calibre
+  DOCKER_MODS: linuxserver/mods:universal-calibre
 calibre_web_docker_envs_custom: {}
 calibre_web_docker_envs_theme:
-  DOCKER_MODS: "linuxserver/calibre-web:calibre|ghcr.io/gilbn/theme.park:calibre-web"
+  DOCKER_MODS: "linuxserver/mods:universal-calibre|ghcr.io/gilbn/theme.park:calibre-web"
   TP_DOMAIN: "{{ calibre_web_themepark_domain }}"
   TP_THEME: "{{ calibre_web_themepark_theme }}"
 calibre_web_docker_envs: "{{ calibre_web_docker_envs_default