diff --git a/cartridges/bm_cloudinary_pd/cartridge/scripts/cloudinary/version.json b/cartridges/bm_cloudinary_pd/cartridge/scripts/cloudinary/version.json
index 199a1eb..dc61226 100644
--- a/cartridges/bm_cloudinary_pd/cartridge/scripts/cloudinary/version.json
+++ b/cartridges/bm_cloudinary_pd/cartridge/scripts/cloudinary/version.json
@@ -1,4 +1,3 @@
 {
-    "videoPlayerVersion": "1.10.1",
     "version": "24.1.1"
 }
diff --git a/cartridges/int_cloudinary_pd/cartridge/scripts/cloudinary/version.json b/cartridges/int_cloudinary_pd/cartridge/scripts/cloudinary/version.json
index 0f01f1e..dc61226 100644
--- a/cartridges/int_cloudinary_pd/cartridge/scripts/cloudinary/version.json
+++ b/cartridges/int_cloudinary_pd/cartridge/scripts/cloudinary/version.json
@@ -1,4 +1,3 @@
 {
-    "version": "24.1.1",
-    "videoPlayerVersion": "1.10.1"
+    "version": "24.1.1"
 }
diff --git a/cartridges/int_cloudinary_pd/cartridge/static/default/js/cloudinaryImages.js b/cartridges/int_cloudinary_pd/cartridge/static/default/js/cloudinaryImages.js
index 13bae3a..615eb20 100644
--- a/cartridges/int_cloudinary_pd/cartridge/static/default/js/cloudinaryImages.js
+++ b/cartridges/int_cloudinary_pd/cartridge/static/default/js/cloudinaryImages.js
@@ -8,7 +8,7 @@ function renderImgs() {
         conf.secure_distribution = window.cname;
         conf.private_cdn = true;
     }
-    cld = cloudinary.default.Cloudinary.new(conf);
+    const cld = cloudinary.default.Cloudinary.new(conf);
     let config = cld.config();
     if (config.secure === false) {
         delete cld.config({ cname: window.cname }).secure_distribution;
diff --git a/cartridges/int_cloudinary_pd/cartridge/templates/default/experience/components/assets/cloudinaryImage.isml b/cartridges/int_cloudinary_pd/cartridge/templates/default/experience/components/assets/cloudinaryImage.isml
index b477851..8075153 100755
--- a/cartridges/int_cloudinary_pd/cartridge/templates/default/experience/components/assets/cloudinaryImage.isml
+++ b/cartridges/int_cloudinary_pd/cartridge/templates/default/experience/components/assets/cloudinaryImage.isml
@@ -3,32 +3,43 @@
     This document renders an instance of the component. Multiple instances can be placed on the page.
 
 </iscomment>
+<isset name="sitePref" value="${dw.system.Site.current.preferences.custom}" scope="page" />
 <isscript>
     // SFRA has a logic bug where full urls are added twice, so we need to check for duplicates before adding.
-    assets = require('*/cartridge/scripts/assets.js');
+    var assets = require('*/cartridge/scripts/assets.js');
+    pdict.viewmodel.CLDPDVideoPlayerJSURL = sitePref.CLDPDVideoPlayerJSURL;
+    pdict.viewmodel.CLDPDShrinkwrapJSURL = sitePref.CLDPDShrinkwrapJSURL;
+
     assets.addJs('js/cloudinaryImages.js');
 </isscript>
 
 <script>
-  var value = JSON.parse('<isprint value="${JSON.stringify(pdict.viewmodel)}" encoding="jsonvalue"/>');
-  window.cldImages = window.cldImages || [];
-  window.cldImages.push(value);
-  window.cloudName = value.cloudName;
-  window.cname = value.cname || null;
+    var value = JSON.parse('<isprint value="${JSON.stringify(pdict.viewmodel)}" encoding="jsonvalue"/>');
+    window.cldImages = window.cldImages || [];
+    window.cldImages.push(value);
+    window.cloudName = value.cloudName;
+    window.cname = value.cname || null;
+
+    // Cloudinary Core JS
+    const script = document.querySelector('script[src="'+value.CLDPDVideoPlayerJSURL+'"]');
+    if (script === null) {
+        var shrinkWrap = document.createElement('script');
+        shrinkWrap.src = value.CLDPDShrinkwrapJSURL;
+        document.body.appendChild(shrinkWrap);
+    }
 </script>
 
 
 <div class="cloudinary-media-library-container sfdc-component-mock sfdc-component-assets-media_library-mock">
-<isif condition="${pdict.viewmodel.placeholder}">
-<isif condition="${pdict.viewmodel.imageLink}">
-    <a href="${pdict.viewmodel.imageLink}">
-</isif>
-    <img class="component-media_library ml-image" src="${pdict.viewmodel.placeholder}"  data-real-url="${pdict.viewmodel.src}"
-    id="${pdict.viewmodel.id}"
-    alt="${pdict.viewmodel.altText}"
-    style="max-width: 100%">
-<isif condition="${pdict.viewmodel.imageLink}">
-</a>
-</isif>
+    <isif condition="${pdict.viewmodel.placeholder}">
+        <isif condition="${pdict.viewmodel.imageLink}">
+            <a href="${pdict.viewmodel.imageLink}">
+        </isif>
+        <img class="component-media_library ml-image" src="${pdict.viewmodel.placeholder}"
+            data-real-url="${pdict.viewmodel.src}" id="${pdict.viewmodel.id}" alt="${pdict.viewmodel.altText}"
+            style="max-width: 100%">
+        <isif condition="${pdict.viewmodel.imageLink}">
+            </a>
+        </isif>
     </isif>
 </div>
diff --git a/cartridges/int_cloudinary_pd/cartridge/templates/default/experience/components/assets/cloudinaryVideo.isml b/cartridges/int_cloudinary_pd/cartridge/templates/default/experience/components/assets/cloudinaryVideo.isml
index 772a957..fa2ed7a 100755
--- a/cartridges/int_cloudinary_pd/cartridge/templates/default/experience/components/assets/cloudinaryVideo.isml
+++ b/cartridges/int_cloudinary_pd/cartridge/templates/default/experience/components/assets/cloudinaryVideo.isml
@@ -4,24 +4,24 @@
 
 	Refer to module_pagedesigner_custom/cartridge/experience/components/assets/cloudinary_video.js
 </iscomment>
+<isset name="sitePref" value="${dw.system.Site.current.preferences.custom}" scope="page" />
+
 <isscript>
 	// SFRA has a logic bug where full urls are added twice, so we need to check for duplicates before adding.
     var assets = require('*/cartridge/scripts/assets.js');
-	var verJson = require('*/cartridge/scripts/cloudinary/version.json');
-
 
 	// Video Player CSS
-    var src = 'https://unpkg.com/cloudinary-video-player@'+verJson.videoPlayerVersion+'/dist/cld-video-player.min.css';
+	var src = sitePref.CLDPDVideoPlayerCSSURL;
     if (assets.styles.lastIndexOf(src) < 0) {
     	assets.addCss(src);
 	}
 
 	// Cloudinary Video Player JS
-    src = 'https://unpkg.com/cloudinary-video-player@'+verJson.videoPlayerVersion+'/dist/cld-video-player.min.js';
+	src = sitePref.CLDPDVideoPlayerJSURL;
     if (assets.scripts.lastIndexOf(src) < 0) {
 		assets.addJs(src);
 	}
-
+	pdict.viewmodel.CLDPDShrinkwrapJSURL = sitePref.CLDPDShrinkwrapJSURL;
     assets.addJs('/js/cloudinaryVideos.js');
 </isscript>
 
@@ -33,5 +33,11 @@
   window.players.push(value);
   window.cloudName = value.cloudName;
   window.cname = value.cname || null;
+
+  // Check if the Cloudinary Core JS is inculded
+  const shrinkWrapJs = document.querySelector('script[src="'+value.CLDPDShrinkwrapJSURL+'"]');
+  if (shrinkWrapJs) {
+	shrinkWrapJs.parentNode.removeChild(shrinkWrapJs);
+  }
 </script>
 </div>
diff --git a/example/cld_custom_i9n/cartridge/templates/default/experience/components/assets/example.isml b/example/cld_custom_i9n/cartridge/templates/default/experience/components/assets/example.isml
index 4020f89..60058a2 100644
--- a/example/cld_custom_i9n/cartridge/templates/default/experience/components/assets/example.isml
+++ b/example/cld_custom_i9n/cartridge/templates/default/experience/components/assets/example.isml
@@ -1,25 +1,35 @@
-<!--- TEMPLATENAME: example.isml --->
+<iscomment> TEMPLATENAME: example.isml </iscomment>
+<isset name="sitePref" value="${dw.system.Site.current.preferences.custom}" scope="page" />
 
 <isscript>
     // SFRA has a logic bug where full urls are added twice, so we need to check for duplicates before adding.
-    assets = require('*/cartridge/scripts/assets.js');
+    var assets = require('*/cartridge/scripts/assets.js');
+    pdict.viewmodel.CLDPDVideoPlayerJSURL = sitePref.CLDPDVideoPlayerJSURL;
+    pdict.viewmodel.CLDPDShrinkwrapJSURL = sitePref.CLDPDShrinkwrapJSURL;
+
     assets.addJs('*/js/cloudinaryImages.js');
 </isscript>
 
 
 <script>
-  var value = JSON.parse('<isprint value="${JSON.stringify(pdict.viewmodel)}" encoding="jsonvalue"/>');
-  window.cldImages = window.cldImages || [];
-  window.cldImages.push(value);
-  window.cloudName = value.cloudName;
-  window.cname = value.cname || null;
-  console.log(value);
+    var value = JSON.parse('<isprint value="${JSON.stringify(pdict.viewmodel)}" encoding="jsonvalue"/>');
+    window.cldImages = window.cldImages || [];
+    window.cldImages.push(value);
+    window.cloudName = value.cloudName;
+    window.cname = value.cname || null;
+
+    // Cloudinary Core JS
+    const script = document.querySelector('script[src="'+value.CLDPDVideoPlayerJSURL+'"]');
+    if (script === null) {
+        var shrinkWrap = document.createElement('script');
+        shrinkWrap.src = value.CLDPDShrinkwrapJSURL;
+        document.body.appendChild(shrinkWrap);
+    }
 </script>
 
 <h2>${pdict.headline}</h2>
 <div class="cloudinary-media-library-container sfdc-component-mock sfdc-component-assets-media_library-mock">
-    <img class="component-media_library ml-image" src="${pdict.viewmodel.placeholder}"  data-real-url="${pdict.viewmodel.src}"
-         id="${pdict.viewmodel.id}"
-         alt="${pdict.viewmodel.altText}"
-         style="max-width: 100%">
+    <img class="component-media_library ml-image" src="${pdict.viewmodel.placeholder}"
+        data-real-url="${pdict.viewmodel.src}" id="${pdict.viewmodel.id}" alt="${pdict.viewmodel.altText}"
+        style="max-width: 100%">
 </div>
diff --git a/example/cld_custom_i9n/cartridge/templates/default/experience/components/assets/videoExample.isml b/example/cld_custom_i9n/cartridge/templates/default/experience/components/assets/videoExample.isml
index 35d3c7c..effe36d 100644
--- a/example/cld_custom_i9n/cartridge/templates/default/experience/components/assets/videoExample.isml
+++ b/example/cld_custom_i9n/cartridge/templates/default/experience/components/assets/videoExample.isml
@@ -1,23 +1,23 @@
-<!--- TEMPLATENAME: example.isml --->
+<iscomment> TEMPLATENAME: example.isml </iscomment>
+<isset name="sitePref" value="${dw.system.Site.current.preferences.custom}" scope="page" />
 
 <isscript>
     // SFRA has a logic bug where full urls are added twice, so we need to check for duplicates before adding.
     var assets = require('*/cartridge/scripts/assets.js');
-	var verJson = require('*/cartridge/scripts/cloudinary/version.json');
-
 
     // Video Player CSS
-    var src = 'https://unpkg.com/cloudinary-video-player@'+verJson.videoPlayerVersion+'/dist/cld-video-player.min.css';
+    var src = sitePref.CLDPDVideoPlayerCSSURL;
     if (assets.styles.lastIndexOf(src) < 0) {
         assets.addCss(src);
     }
 
     // Cloudinary Video Player JS
-    src = 'https://unpkg.com/cloudinary-video-player@'+verJson.videoPlayerVersion+'/dist/cld-video-player.min.js';
+    src = sitePref.CLDPDVideoPlayerJSURL;
     if (assets.scripts.lastIndexOf(src) < 0) {
         assets.addJs(src);
     }
 
+    pdict.viewmodel.CLDPDShrinkwrapJSURL = sitePref.CLDPDShrinkwrapJSURL;
     assets.addJs('/js/cloudinaryVideos.js');
 </isscript>
 
@@ -25,11 +25,16 @@
 <div class="cloudinary-video-container sfdc-component-mock sfdc-component-assets-media_library_video-mock">
     <video id="${pdict.viewmodel.id}"></video>
     <script>
-      var value = JSON.parse('<isprint value="${JSON.stringify(pdict.viewmodel)}" encoding="jsonvalue"/>');
-      window.players = window.players || [];
-      window.players.push(value);
-      window.cloudName = value.cloudName;
-      window.cname = value.cname || null;
+        var value = JSON.parse('<isprint value="${JSON.stringify(pdict.viewmodel)}" encoding="jsonvalue"/>');
+        window.players = window.players || [];
+        window.players.push(value);
+        window.cloudName = value.cloudName;
+        window.cname = value.cname || null;
+
+        // Check if the Cloudinary Core JS is inculded
+        const shrinkWrapJs = document.querySelector('script[src="'+value.CLDPDShrinkwrapJSURL+'"]');
+        if (shrinkWrapJs) {
+            shrinkWrapJs.parentNode.removeChild(shrinkWrapJs);
+        }
     </script>
 </div>
-
diff --git a/metadata/cloudinary_pagedesigner_metadata.zip b/metadata/cloudinary_pagedesigner_metadata.zip
index 6d3c1d1..43772c8 100644
Binary files a/metadata/cloudinary_pagedesigner_metadata.zip and b/metadata/cloudinary_pagedesigner_metadata.zip differ