diff --git a/public/.htaccess b/public/.htaccess
index 0a17221ce1..e2c38f6b0a 100755
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -9,6 +9,9 @@
     RewriteCond %{HTTP:Authorization} .
     RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
 
+    # Static files in these directories are versioned or never change...
+    RewriteRule ^(assets|fonts|images|img)/ - [E=CDASH_IMMUTABLE:1]
+
     # Redirect Trailing Slashes If Not A Folder...
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteCond %{REQUEST_URI} (.+)/$
@@ -21,8 +24,9 @@
 </IfModule>
 
 <IfModule mod_headers.c>
-    <FilesMatch "\.(css|js|svg|gif|png)$">
-        Header set Cache-Control "max-age=31536000"
+    <FilesMatch "\.(css|js|svg|gif|png|woff2?|ttf|eot)$">
+        Header set Cache-Control "max-age=31536000, immutable" env=CDASH_IMMUTABLE
+        Header set Cache-Control "no-cache" env=!CDASH_IMMUTABLE
     </FilesMatch>
 
     Header set Content-Security-Policy "default-src 'self' 'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' data:"
diff --git a/resources/views/components/footer.blade.php b/resources/views/components/footer.blade.php
index 8d4d38af93..ffc580d48f 100755
--- a/resources/views/components/footer.blade.php
+++ b/resources/views/components/footer.blade.php
@@ -4,7 +4,7 @@
 <div id="footer" class="ng-scope">
     <div>
         <a href="https://www.kitware.com">
-            <img src="{{ asset('img/kitware_logo_footer.svg') }}" alt="logo" height="30" style="height: 30px;">
+            <img src="{{ asset('img/kitware_logo_footer.svg?rev=2023-05-31') }}" alt="logo" height="30" style="height: 30px;">
         </a>
     </div>
     <div class="footer-element" style="text-align: right;">
diff --git a/resources/views/components/header.blade.php b/resources/views/components/header.blade.php
index 189f9a8530..5cd6edd062 100755
--- a/resources/views/components/header.blade.php
+++ b/resources/views/components/header.blade.php
@@ -65,7 +65,7 @@
                 @if(isset($project) && $logoid !== null)
                     <img id="projectlogo" height="50px" alt="" src="{{ url('/image/' . $logoid) }}" />
                 @else
-                    <img id="projectlogo" height="50px" alt="" src="{{ asset('img/cdash.svg') }}" />
+                    <img id="projectlogo" height="50px" alt="" src="{{ asset('img/cdash.svg?rev=2023-05-31') }}" />
                 @endif
             </a>
         </div>