diff --git a/app/views/layouts/default.phtml b/app/views/layouts/default.phtml
index 9214e7a15b..ad74e8b216 100644
--- a/app/views/layouts/default.phtml
+++ b/app/views/layouts/default.phtml
@@ -11,6 +11,7 @@ $litespeed  = $this->getParam('litespeed', true);
 $analytics  = $this->getParam('analytics', 'UA-26264668-9');
 $env        = $this->getParam('env', '');
 $canonical  = $this->getParam('canonical', '');
+$buster     = 18; // For DEV env
 
 if(!empty($platforms)) {
     $platforms = array_map(function($platform) {
@@ -37,8 +38,8 @@ if(!empty($platforms)) {
     <link rel="manifest" href="/manifest.json">
     <title><?php echo $this->getParam('title', ''); ?></title>
     <meta name="description" content="<?php echo $this->getParam('description', ''); ?>" />
-    <link rel="stylesheet" media="all" type="text/css" href="/dist/styles/default-<?php echo Locale::getText('settings.direction'); ?>.css?v=4.<?php echo $version; ?>" />
-    <link rel="icon" type="image/png" href="<?php echo $this->escape($this->getParam('icon', '')); ?>?v=1" />
+    <link rel="stylesheet" media="all" type="text/css" href="/dist/styles/default-<?php echo Locale::getText('settings.direction'); ?>.css?v=<?php echo $buster; ?>.<?php echo $version; ?>" />
+    <link rel="icon" type="image/png" href="<?php echo $this->escape($this->getParam('icon', '')); ?>?v=<?php echo $buster; ?>" />
     <link href="https://fonts.googleapis.com/css?family=Poppins:100,300,400,500,600" rel="stylesheet">
     <link rel="apple-touch-icon" href="/images/apple.png">
     <!-- <link rel="preconnect" href="" /> -->
@@ -57,7 +58,7 @@ if(!empty($platforms)) {
     <?php if (!empty($canonical)): ?>
         <meta property="og:url" content="<?php echo $canonical; ?>" />
     <?php endif; ?>
-    <meta property="og:image"  content="<?php echo $protocol; ?>://<?php echo $domain; ?>/images/logo.png?v=1" />
+    <meta property="og:image"  content="<?php echo $protocol; ?>://<?php echo $domain; ?>/images/logo.png?v=<?php echo $buster; ?>" />
     <script>
 
         (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@@ -90,7 +91,7 @@ if(!empty($platforms)) {
 
             script.type   = 'text/javascript';
             script.async  = true;
-            script.src    = '/dist/scripts/app-all.js?v=1.<?php echo $version; ?>';
+            script.src    = '/dist/scripts/app-all.js?v=<?php echo $buster; ?>.<?php echo $version; ?>';
             script.onload = function() {
                 window.ls.run(window);
             };