diff --git a/Magento_BundleConfig/Block/Html/Head/Config.php b/Magento_BundleConfig/Block/Html/Head/Config.php
deleted file mode 100644
index 3fa9236..0000000
--- a/Magento_BundleConfig/Block/Html/Head/Config.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\BundleConfig\Block\Html\Head;
-
-use Magento\BundleConfig\Model\FileManager as BundleFileManager;
-use Magento\Framework\App\Request\Http as HttpRequest;
-use Magento\Framework\Filesystem\DirectoryList;
-use Magento\Framework\RequireJs\Config as RequireJsConfig;
-use Magento\Framework\App\State as AppState;
-use Magento\Framework\View\Element\Context as ViewElementContext;
-use Magento\Framework\View\Page\Config as PageConfig;
-use Magento\RequireJs\Model\FileManager;
-
-class Config extends \Magento\Framework\View\Element\AbstractBlock
-{
-    /**
-     * @var FileManager
-     */
-    private $fileManager;
-
-    /**
-     * @var PageConfig
-     */
-    private $pageConfig;
-
-    /**
-     * @var AppState 
-     */
-    private $appState;
-
-    /**
-     * @var DirectoryList
-     */
-    private $dir;
-
-    /**
-     * @var HttpRequest
-     */
-    private $httpRequest;
-
-    /**
-     * @param ViewElementContext $context
-     * @param AppState $appState
-     * @param BundleFileManager $fileManager
-     * @param PageConfig $pageConfig
-     * @param array $data
-     */
-    public function __construct(
-        ViewElementContext $context,
-        AppState $appState,
-        BundleFileManager $fileManager,
-        PageConfig $pageConfig,
-        DirectoryList $dir,
-        HttpRequest $httpRequest,
-        array $data = []
-    ) {
-        parent::__construct($context, $data);
-        $this->fileManager = $fileManager;
-        $this->pageConfig = $pageConfig;
-        $this->appState = $appState;
-        $this->dir = $dir;
-        $this->httpRequest = $httpRequest;
-    }
-
-    /**
-     * Include specified AMD bundle as an asset on the page
-     *
-     * @return \Magento\Framework\View\Element\AbstractBlock
-     */
-    protected function _prepareLayout()
-    {
-        if ($this->appState->getMode() === AppState::MODE_DEVELOPER) {
-            return parent::_prepareLayout();
-        }
-
-        $staticDir = $this->dir->getPath('static');
-        $fullActionName = $this->httpRequest->getFullActionName();
-
-        $assetCollection = $this->pageConfig->getAssetCollection();
-
-        $shared = $this->fileManager->createSharedJsBundleAsset();
-        $sharedBundleRelPath = $shared->getFilePath();
-        $sharedBundleAbsPath = $staticDir . "/" . $sharedBundleRelPath;
-
-        if (file_exists($sharedBundleAbsPath)) {
-            $assetCollection->insert(
-                $sharedBundleRelPath,
-                $shared,
-                RequireJsConfig::REQUIRE_JS_FILE_NAME
-            );
-        }
-
-        $bundleConfig = $this->fileManager->createJsBundleAsset($fullActionName);
-        $pageSpecificBundleRelPath = $bundleConfig->getFilePath();
-        $pageSpecificBundleAbsPath = $staticDir . "/" . $pageSpecificBundleRelPath;
-
-        if (file_exists($pageSpecificBundleAbsPath)) {
-            $assetCollection->insert(
-                $pageSpecificBundleRelPath,
-                $bundleConfig,
-                $sharedBundleRelPath
-            );
-        }
-
-        return parent::_prepareLayout();
-    }
-}
diff --git a/Magento_BundleConfig/ViewModel/PageSpecificBundle.php b/Magento_BundleConfig/ViewModel/PageSpecificBundle.php
new file mode 100644
index 0000000..6254ca3
--- /dev/null
+++ b/Magento_BundleConfig/ViewModel/PageSpecificBundle.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\BundleConfig\ViewModel;
+
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\App\State as AppState;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem\DirectoryList;
+use Magento\Framework\View\Asset\File;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Framework\View\Asset\Repository;
+
+/**
+ * View model responsible for getting page specific bundle js for layout.
+ */
+class PageSpecificBundle implements ArgumentInterface
+{
+    /**
+     * @var Repository
+     */
+    private $assetRepo;
+
+    /**
+     * @var HttpRequest
+     */
+    private $httpRequest;
+
+    /**
+     * @var DirectoryList
+     */
+    private $dir;
+
+    /**
+     * @var AppState
+     */
+    private $appState;
+
+    /**
+     * @var File
+     */
+    private $asset;
+
+    /**
+     * @param Repository $assetRepo
+     * @param HttpRequest $httpRequest
+     * @param DirectoryList $dir
+     * @param AppState $appState
+     */
+    public function __construct(
+        Repository $assetRepo,
+        HttpRequest $httpRequest,
+        DirectoryList $dir,
+        AppState $appState
+    ) {
+        $this->assetRepo = $assetRepo;
+        $this->httpRequest = $httpRequest;
+        $this->dir = $dir;
+        $this->appState = $appState;
+    }
+
+    /**
+     * Return page specific bundle asset url.
+     *
+     * @return string
+     * @throws LocalizedException
+     */
+    public function getPageSpecificBundleUrl()
+    {
+        $this->asset = $this->asset ?? $this->getAsset();
+
+        return $this->asset->getUrl();
+    }
+
+    /**
+     * Check if page specific bundle asset exists.
+     *
+     * @return bool
+     * @throws LocalizedException
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    public function fileExists()
+    {
+        $this->asset = $this->asset ?? $this->getAsset();
+
+        $staticDir = $this->dir->getPath('static');
+
+        $pageSpecificBundleRelPath = $this->asset->getPath();
+        $pageSpecificBundleAbsPath = $staticDir . "/" . $pageSpecificBundleRelPath;
+
+        return file_exists($pageSpecificBundleAbsPath);
+    }
+
+    /**
+     * Get page specific bundle asset.
+     *
+     * @return File
+     * @throws LocalizedException
+     */
+    private function getAsset()
+    {
+        $fullActionName = $this->httpRequest->getFullActionName();
+
+        $formattedActionName = str_replace("_", "-", $fullActionName);
+        $filePath = 'bundles/' . $formattedActionName . '.js';
+
+        return $this->assetRepo->createAsset($filePath);
+    }
+
+    /**
+     * Check if developer mode is enabled.
+     *
+     * @return bool
+     */
+    public function isDeveloperModeEnabled()
+    {
+        return $this->appState->getMode() === AppState::MODE_DEVELOPER;
+    }
+}
diff --git a/Magento_BundleConfig/ViewModel/SharedBundle.php b/Magento_BundleConfig/ViewModel/SharedBundle.php
new file mode 100644
index 0000000..18c6639
--- /dev/null
+++ b/Magento_BundleConfig/ViewModel/SharedBundle.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\BundleConfig\ViewModel;
+
+use Magento\Framework\App\State as AppState;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem\DirectoryList;
+use Magento\Framework\View\Asset\File;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Framework\View\Asset\Repository;
+
+/**
+ * View model responsible for getting shared bundle js for layout.
+ */
+class SharedBundle implements ArgumentInterface
+{
+    /**
+     * @var Repository
+     */
+    private $assetRepo;
+
+    /**
+     * @var $filePath
+     */
+    private $filePath;
+
+    /**
+     * @var DirectoryList
+     */
+    private $dir;
+
+    /**
+     * @var AppState
+     */
+    private $appState;
+
+    /**
+     * @var File
+     */
+    private $asset;
+
+    /**
+     * @param Repository $assetRepo
+     * @param DirectoryList $dir
+     * @param AppState $appState
+     * @param string $filePath
+     */
+    public function __construct(
+        Repository $assetRepo,
+        DirectoryList $dir,
+        AppState $appState,
+        string $filePath = ''
+    ) {
+        $this->assetRepo = $assetRepo;
+        $this->dir = $dir;
+        $this->appState = $appState;
+        $this->filePath = $filePath;
+    }
+
+    /**
+     * Return shared bundle asset url.
+     *
+     * @return string
+     * @throws LocalizedException
+     */
+    public function getSharedBundleUrl()
+    {
+        $this->asset = $this->asset ?? $this->getAsset();
+
+        return $this->asset->getUrl();
+    }
+
+    /**
+     * Check if shared bundle asset exists.
+     *
+     * @return bool
+     * @throws LocalizedException
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    public function fileExists()
+    {
+        $this->asset = $this->asset ?? $this->getAsset();
+
+        $staticDir = $this->dir->getPath('static');
+
+        $sharedBundleRelPath = $this->asset->getPath();
+        $sharedBundleAbsPath = $staticDir . "/" . $sharedBundleRelPath;
+
+        return file_exists($sharedBundleAbsPath);
+    }
+
+    /**
+     * Get shared bundle asset.
+     *
+     * @return File
+     * @throws LocalizedException
+     */
+    private function getAsset()
+    {
+        return $this->assetRepo->createAsset($this->filePath);
+    }
+
+    /**
+     * Check if developer mode is enabled.
+     *
+     * @return bool
+     */
+    public function isDeveloperModeEnabled()
+    {
+        return $this->appState->getMode() === AppState::MODE_DEVELOPER;
+    }
+}
diff --git a/Magento_BundleConfig/etc/di.xml b/Magento_BundleConfig/etc/di.xml
index ba4092c..ba42146 100644
--- a/Magento_BundleConfig/etc/di.xml
+++ b/Magento_BundleConfig/etc/di.xml
@@ -9,4 +9,9 @@
     <type name="Magento\Framework\View\Asset\Minification">
         <plugin name="bundle_config_minification_plugin" type="Magento\BundleConfig\Plugin\View\Asset\MinificationPlugin" />
     </type>
+    <type name="Magento\BundleConfig\ViewModel\SharedBundle">
+        <arguments>
+            <argument name="filePath" xsi:type="string">bundles/shared.js</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/Magento_BundleConfig/view/frontend/layout/default.xml b/Magento_BundleConfig/view/frontend/layout/default.xml
index 8be69df..2eae4c9 100644
--- a/Magento_BundleConfig/view/frontend/layout/default.xml
+++ b/Magento_BundleConfig/view/frontend/layout/default.xml
@@ -6,10 +6,18 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <update handle="default_head_blocks"/>
     <body>
-        <referenceContainer name="after.body.start">
-            <block class="Magento\BundleConfig\Block\Html\Head\Config" name="bundle-config" before="requirejs-config"/>
-        </referenceContainer>
+        <referenceBlock name="head.additional">
+            <block name="shared_bundle" template="Magento_BundleConfig::shared_bundle.phtml">
+                <arguments>
+                    <argument name="sharedBundleViewModel" xsi:type="object">Magento\BundleConfig\ViewModel\SharedBundle</argument>
+                </arguments>
+            </block>
+            <block name="page_specific_bundle" template="Magento_BundleConfig::page_specific_bundle.phtml" after="shared_bundle">
+                <arguments>
+                    <argument name="pageSpecificBundleViewModel" xsi:type="object">Magento\BundleConfig\ViewModel\PageSpecificBundle</argument>
+                </arguments>
+            </block>
+        </referenceBlock>
     </body>
 </page>
diff --git a/Magento_BundleConfig/view/frontend/templates/page_specific_bundle.phtml b/Magento_BundleConfig/view/frontend/templates/page_specific_bundle.phtml
new file mode 100644
index 0000000..49a3fb1
--- /dev/null
+++ b/Magento_BundleConfig/view/frontend/templates/page_specific_bundle.phtml
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\BundleConfig\ViewModel\PageSpecificBundle $viewModel */
+$viewModel = $block->getData('pageSpecificBundleViewModel');
+if (!$viewModel->isDeveloperModeEnabled() && $viewModel->fileExists()) {
+    ?>
+    <script type="text/javascript" src="<?= /* @noEscape */$viewModel->getPageSpecificBundleUrl() ?>"></script>
+    <?php
+}
diff --git a/Magento_BundleConfig/view/frontend/templates/shared_bundle.phtml b/Magento_BundleConfig/view/frontend/templates/shared_bundle.phtml
new file mode 100644
index 0000000..d435c3a
--- /dev/null
+++ b/Magento_BundleConfig/view/frontend/templates/shared_bundle.phtml
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\BundleConfig\ViewModel\SharedBundle $viewModel */
+$viewModel = $block->getData('sharedBundleViewModel');
+if (!$viewModel->isDeveloperModeEnabled() && $viewModel->fileExists()) {
+    ?>
+    <script type="text/javascript" src="<?= /* @noEscape */$viewModel->getSharedBundleUrl() ?>"></script>
+    <?php
+}