diff --git a/app/Library/Assets.php b/app/Library/Assets.php
index 8a423307..c993bf44 100644
--- a/app/Library/Assets.php
+++ b/app/Library/Assets.php
@@ -20,6 +20,28 @@
 
 class Assets
 {
+    public static function scriptIncludes(string $area) {
+        $scriptTags = '';
+
+        if ('app' === $area) {
+            $scripts = ['app.js', 'templates.js'];
+        } elseif ('embed' === $area) {
+            $scripts = ['embed.js'];
+        } else {
+            throw new InvalidArgumentException('A valid app area must be specified!');
+        }
+
+        foreach ($scripts as $filename) {
+            $scriptTags .= "<script src='/build/scripts/{$filename}?" . filemtime(public_path("build/scripts/{$filename}")) . "'></script>";
+        }
+
+        if (Config::get("app.debug")) {
+            $scriptTags .= '<script src="http://localhost:61999/webpack-dev-server.js"></script>';
+        }
+
+        return $scriptTags;
+    }
+
     public static function styleIncludes($area = 'app')
     {
         if (!Config::get("app.debug")) {
diff --git a/resources/views/shared/_app_layout.blade.php b/resources/views/shared/_app_layout.blade.php
index e8b7bbce..06ed3127 100644
--- a/resources/views/shared/_app_layout.blade.php
+++ b/resources/views/shared/_app_layout.blade.php
@@ -158,13 +158,7 @@
         </script>
     @endif
 
-    @if (Config::get("app.debug"))
-        <script src="http://localhost:61999/build/scripts/app.js"></script>
-        <script src="http://localhost:61999/webpack-dev-server.js"></script>
-    @else
-        <script src="/build/scripts/app.js"></script>
-        <script src="/build/scripts/templates.js"></script>
-    @endif
+    {!! Assets::scriptIncludes('app') !!}
 
     @yield('app_scripts')
 
diff --git a/resources/views/tracks/embed.blade.php b/resources/views/tracks/embed.blade.php
index 64d90326..6288e69f 100644
--- a/resources/views/tracks/embed.blade.php
+++ b/resources/views/tracks/embed.blade.php
@@ -62,12 +62,7 @@
         </div>
     @endif
 
-    @if (Config::get("app.debug"))
-        <script src="http://localhost:61999/build/scripts/embed.js"></script>
-        <script src="http://localhost:61999/webpack-dev-server.js"></script>
-    @else
-        <script src="/build/scripts/embed.js"></script>
-    @endif
+    {!! Assets::scriptIncludes('embed') !!}
 
     @if(config('ponyfm.google_analytics_id'))
         <script type="text/javascript">