diff --git a/jest.config.js b/jest.config.js
index cc7eddadc5..7cea379547 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -135,7 +135,14 @@ const jestConfig = {
         configureProject('upward-js', 'Upward JS', () => ({
             testEnvironment: 'node'
         })),
-        configureProject('venia-concept', 'Venia Storefront', testVenia),
+        configureProject('venia-concept', 'Venia Storefront', inPackage => {
+            const veniaConceptConfig = testVenia(inPackage);
+            veniaConceptConfig.setupFiles = [
+                ...veniaConceptConfig.setupFilesAfterEnv,
+                inPackage('scripts/fetch-mock.js')
+            ];
+            return veniaConceptConfig;
+        }),
         configureProject('venia-ui', 'Venia UI', testVenia),
         // Test any root CI scripts as well, to ensure stable CI behavior.
         configureProject('scripts', 'CI Scripts', () => ({
@@ -175,7 +182,10 @@ const jestConfig = {
         '__fixtures__',
         '__helpers__',
         '__snapshots__'
-    ]
+    ],
+    globals: {
+        STORE_NAME: 'Venia'
+    }
 };
 
 if (process.env.npm_lifecycle_event === 'test:ci') {
diff --git a/packages/pwa-buildpack/lib/WebpackTools/PWADevServer.js b/packages/pwa-buildpack/lib/WebpackTools/PWADevServer.js
index 8fb052d5da..03a42a64b2 100644
--- a/packages/pwa-buildpack/lib/WebpackTools/PWADevServer.js
+++ b/packages/pwa-buildpack/lib/WebpackTools/PWADevServer.js
@@ -55,7 +55,6 @@ const PWADevServer = {
             contentBase: false, // UpwardDevServerPlugin serves static files
             compress: true,
             hot: true,
-            writeToDisk: true,
             watchOptions: {
                 // polling is CPU intensive - provide the option to turn it on if needed
                 poll: !!parseInt(devServer.watchOptionsUsePolling) || false
@@ -237,7 +236,7 @@ const PWADevServer = {
             new UpwardDevServerPlugin(
                 webpackDevServerOptions,
                 process.env,
-                path.resolve(webpackConfig.output.path, upwardPath)
+                path.resolve(webpackConfig.context, upwardPath)
             )
         );
 
diff --git a/packages/venia-concept/package.json b/packages/venia-concept/package.json
index 59b69ceb5b..8c0216a26a 100644
--- a/packages/venia-concept/package.json
+++ b/packages/venia-concept/package.json
@@ -87,9 +87,11 @@
     "graphql-cli": "~3.0.11",
     "graphql-cli-validate-magento-pwa-queries": "~1.0.0",
     "graphql-tag": "~2.10.1",
+    "html-webpack-plugin": "~3.2.0",
     "informed": "~2.1.13",
     "lodash.over": "~4.7.0",
     "memoize-one": "~5.0.0",
+    "node-fetch": "~2.6.0",
     "prettier": "~1.16.4",
     "prop-types": "~15.7.2",
     "react": "~16.9.0",
diff --git a/packages/venia-concept/scripts/fetch-mock.js b/packages/venia-concept/scripts/fetch-mock.js
new file mode 100644
index 0000000000..c158ca4267
--- /dev/null
+++ b/packages/venia-concept/scripts/fetch-mock.js
@@ -0,0 +1 @@
+global.fetch = require('jest-fetch-mock');
diff --git a/packages/venia-concept/src/MediaBackendURLFetcherPlugin.js b/packages/venia-concept/src/MediaBackendURLFetcherPlugin.js
new file mode 100644
index 0000000000..877b71abe3
--- /dev/null
+++ b/packages/venia-concept/src/MediaBackendURLFetcherPlugin.js
@@ -0,0 +1,40 @@
+const fetch = require('node-fetch');
+
+const getMediaURL = () =>
+    fetch(new URL('graphql', process.env.MAGENTO_BACKEND_URL).toString(), {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+            query: 'query { storeConfig { secure_base_media_url } }'
+        })
+    })
+        .then(result => result.json())
+        .then(json => json.data.storeConfig.secure_base_media_url)
+        .catch(err => {
+            console.error(err);
+            return '';
+        });
+
+/**
+ * Webpack plugin that makes GraphQL call to get the Media
+ * Backend URL which is needed by WebpackHTMLPlugin to be
+ * replace in template.html. This is done by fetching the URL
+ * from GraphQL and placing it in global.MAGENTO_MEDIA_BACKEND_URL
+ * for the WebpackHTMLPlugin to pickup.
+ */
+class MediaBackendURLFetcherPlugin {
+    apply(compiler) {
+        compiler.hooks.emit.tapPromise(
+            'MediaBackendURLFetcherPlugin',
+            () =>
+                new Promise(resolve => {
+                    getMediaURL().then(url => {
+                        global.MAGENTO_MEDIA_BACKEND_URL = url;
+                        resolve();
+                    });
+                })
+        );
+    }
+}
+
+module.exports = MediaBackendURLFetcherPlugin;
diff --git a/packages/venia-concept/src/__tests__/MediaBackendURLFetcherPlugin.spec.js b/packages/venia-concept/src/__tests__/MediaBackendURLFetcherPlugin.spec.js
new file mode 100644
index 0000000000..98b4004cc0
--- /dev/null
+++ b/packages/venia-concept/src/__tests__/MediaBackendURLFetcherPlugin.spec.js
@@ -0,0 +1,53 @@
+const MediaBackendURLFetcherPlugin = require('../MediaBackendURLFetcherPlugin');
+
+const tapPromise = jest.fn();
+
+const compiler = {
+    hooks: {
+        emit: {
+            tapPromise
+        }
+    }
+};
+
+beforeEach(() => {
+    process.env.MAGENTO_BACKEND_URL =
+        'https://venia-cicd-lrov2hi-mfwmkrjfqvbjk.us-4.magentosite.cloud/';
+    fetch.resetMocks();
+});
+
+test('The plugin prototype should have apply function in its Prototype', () => {
+    expect(
+        MediaBackendURLFetcherPlugin.prototype.hasOwnProperty('apply')
+    ).toBeTruthy();
+});
+
+test('tapPromise function should be called on compiler hooks', () => {
+    const mediaBackendURLFetcher = new MediaBackendURLFetcherPlugin();
+    mediaBackendURLFetcher.apply(compiler);
+    expect(tapPromise.mock.calls[0][0]).toBe('MediaBackendURLFetcherPlugin');
+    expect(tapPromise.mock.calls[0][1] instanceof Function).toBeTruthy();
+});
+
+test('second argument to tapPromise should return a Promise which when resolved should set global.MAGENTO_MEDIA_BACKEND_URL to a URL', () => {
+    const expectedMediaURL =
+        'https://venia-cicd-lrov2hi-mfwmkrjfqvbjk.us-4.magentosite.cloud/media/';
+    fetch.mockResponseOnce(
+        JSON.stringify({
+            data: {
+                storeConfig: {
+                    secure_base_media_url: expectedMediaURL
+                }
+            }
+        })
+    );
+
+    expect(global.MAGENTO_MEDIA_BACKEND_URL).toBe(undefined);
+
+    const mediaBackendURLFetcher = new MediaBackendURLFetcherPlugin();
+    mediaBackendURLFetcher.apply(compiler);
+
+    return tapPromise.mock.calls[0][1].call().then(() => {
+        expect(global.MAGENTO_MEDIA_BACKEND_URL).toBe(expectedMediaURL);
+    });
+});
diff --git a/packages/venia-concept/template.html b/packages/venia-concept/template.html
new file mode 100644
index 0000000000..d218d090c8
--- /dev/null
+++ b/packages/venia-concept/template.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html lang="en" data-image-optimizing-origin="<%= process.env.IMAGE_OPTIMIZING_ORIGIN %>" data-media-backend="<%= global.MAGENTO_MEDIA_BACKEND_URL %>">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta name="theme-color" content="#ff6334">
+        <link rel="manifest" href="/static/manifest.json">
+        
+        <title>Home Page - <%= STORE_NAME %></title>
+
+        <!--
+            Apple Specific Tags
+    
+            To be included until Safari supports WebAppManifest
+            See Docs:
+            - https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariHTMLRef/Articles/MetaTags.html
+            - https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariWebContent/ConfiguringWebApplications/ConfiguringWebApplications.html
+        -->
+        <!--
+            Apple Icons for Homescreen
+            Sizes: https://developer.apple.com/design/human-interface-guidelines/ios/icons-and-images/app-icon/
+        -->
+        <link rel="apple-touch-icon" href="/icons/venia_square_57.png">
+        <link rel="apple-touch-icon" sizes="180x180" href="/icons/apple-touch-icon.png">
+        <link rel="preconnect" href="<%= process.env.MAGENTO_BACKEND_URL %>">
+
+        <style type="text/css">
+            /* vietnamese */
+            @font-face {
+              font-family: 'Muli';
+              font-style: normal;
+              font-weight: 300;
+              font-display: swap;
+              src: local('Muli Light'), local('Muli-Light'), url(https://fonts.gstatic.com/s/muli/v13/7Au_p_0qiz-adZnkOCr2z24PMFk-0g.woff2) format('woff2');
+              unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB;
+            }
+            /* latin-ext */
+            @font-face {
+              font-family: 'Muli';
+              font-style: normal;
+              font-weight: 300;
+              font-display: swap;
+              src: local('Muli Light'), local('Muli-Light'), url(https://fonts.gstatic.com/s/muli/v13/7Au_p_0qiz-adZnkOCv2z24PMFk-0g.woff2) format('woff2');
+              unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+            }
+            /* latin */
+            @font-face {
+              font-family: 'Muli';
+              font-style: normal;
+              font-weight: 300;
+              font-display: swap;
+              src: local('Muli Light'), local('Muli-Light'), url(https://fonts.gstatic.com/s/muli/v13/7Au_p_0qiz-adZnkOCX2z24PMFk.woff2) format('woff2');
+              unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+            }
+          </style>
+    </head>
+    <body>
+        <div id="root" />
+    </body>
+</html>
diff --git a/packages/venia-concept/webpack.config.js b/packages/venia-concept/webpack.config.js
index 16aea9bfcd..4a35e858c9 100644
--- a/packages/venia-concept/webpack.config.js
+++ b/packages/venia-concept/webpack.config.js
@@ -1,4 +1,7 @@
 const { configureWebpack } = require('@magento/pwa-buildpack');
+const { DefinePlugin } = require('webpack');
+const HTMLWebpackPlugin = require('html-webpack-plugin');
+const MediaBackendUrlFetcherPlugin = require('./src/MediaBackendURLFetcherPlugin');
 
 module.exports = async env => {
     const config = await configureWebpack({
@@ -36,13 +39,33 @@ module.exports = async env => {
         env
     });
 
-    // configureWebpack() returns a regular Webpack configuration object.
-    // You can customize the build by mutating the object here, as in
-    // this example:
+    /**
+     * configureWebpack() returns a regular Webpack configuration object.
+     * You can customize the build by mutating the object here, as in
+     * this example. Since it's a regular Webpack configuration, the object
+     * supports the `module.noParse` option in Webpack, documented here:
+     * https://webpack.js.org/configuration/module/#modulenoparse
+     */
     config.module.noParse = [/braintree\-web\-drop\-in/];
-    // Since it's a regular Webpack configuration, the object supports the
-    // `module.noParse` option in Webpack, documented here:
-    // https://webpack.js.org/configuration/module/#modulenoparse
+    config.plugins = [
+        ...config.plugins,
+        new DefinePlugin({
+            /**
+             * Make sure to add the same constants to
+             * the globals object in jest.config.js.
+             */
+            STORE_NAME: JSON.stringify('Venia')
+        }),
+        new MediaBackendUrlFetcherPlugin(),
+        new HTMLWebpackPlugin({
+            filename: 'index.html',
+            template: './template.html',
+            minify: {
+                collapseWhitespace: true,
+                removeComments: true
+            }
+        })
+    ];
 
     return config;
 };
diff --git a/packages/venia-ui/lib/RootComponents/Product/product.js b/packages/venia-ui/lib/RootComponents/Product/product.js
index 089c8ca83f..a809e963e5 100644
--- a/packages/venia-ui/lib/RootComponents/Product/product.js
+++ b/packages/venia-ui/lib/RootComponents/Product/product.js
@@ -61,7 +61,7 @@ class Product extends Component {
 
                     return (
                         <Fragment>
-                            <Title>{`${product.name} - Venia`}</Title>
+                            <Title>{`${product.name} - ${STORE_NAME}`}</Title>
                             <ProductFullDetail
                                 product={this.mapProduct(product)}
                                 addToCart={this.props.addItemToCart}
diff --git a/packages/venia-ui/lib/components/App/__tests__/app.spec.js b/packages/venia-ui/lib/components/App/__tests__/app.spec.js
index 002c20c5ff..7cc55d2795 100644
--- a/packages/venia-ui/lib/components/App/__tests__/app.spec.js
+++ b/packages/venia-ui/lib/components/App/__tests__/app.spec.js
@@ -59,6 +59,10 @@ const getAndConfirmProps = (parent, type, props = {}) => {
     return instance;
 };
 
+beforeAll(() => {
+    global.STORE_NAME = 'Venia';
+});
+
 afterAll(() => window.location.reload.mockRestore());
 
 test('renders a full page with onlineIndicator and routes', () => {
diff --git a/packages/venia-ui/lib/components/App/app.js b/packages/venia-ui/lib/components/App/app.js
index 9974fd4113..22bb1d7777 100644
--- a/packages/venia-ui/lib/components/App/app.js
+++ b/packages/venia-ui/lib/components/App/app.js
@@ -123,7 +123,7 @@ const App = props => {
 
     return (
         <HeadProvider>
-            <Title>{'Home Page - Venia'}</Title>
+            <Title>{`Home Page - ${STORE_NAME}`}</Title>
             <Main
                 isMasked={overlay}
                 hasBeenOffline={hasBeenOffline}
diff --git a/packages/venia-ui/static/manifest.json b/packages/venia-ui/static/manifest.json
index dce2ee7acc..74dc64b106 100644
--- a/packages/venia-ui/static/manifest.json
+++ b/packages/venia-ui/static/manifest.json
@@ -1,23 +1,26 @@
 {
-  "name": "Venia",
-  "short_name": "Venia",
-  "start_url": "/",
-  "theme_color": "#ff6334",
-  "display": "standalone",
-  "background_color": "#fff",
-  "description": "Shop the look",
-  "icons": [{
-    "src": "/icons/venia_circle_144.png",
-    "sizes": "144x144",
-    "type": "image/png"
-  },{
-    "src": "/icons/venia_circle_192.png",
-    "sizes": "192x192",
-    "type": "image/png"
-  },{
-    "src": "/icons/venia_circle_512.png",
-    "sizes": "512x512",
-    "type": "image/png"
-  }
-  ]
+    "name": "Venia",
+    "short_name": "Venia",
+    "start_url": "/",
+    "theme_color": "#ff6334",
+    "display": "standalone",
+    "background_color": "#fff",
+    "description": "Shop the look",
+    "icons": [
+        {
+            "src": "/static/icons/venia_circle_144.png",
+            "sizes": "144x144",
+            "type": "image/png"
+        },
+        {
+            "src": "/static/icons/venia_circle_192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/static/icons/venia_circle_512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ]
 }
diff --git a/packages/venia-ui/upward.yml b/packages/venia-ui/upward.yml
index 9df445eea8..2a654e9f7e 100644
--- a/packages/venia-ui/upward.yml
+++ b/packages/venia-ui/upward.yml
@@ -6,52 +6,81 @@
 # This object uses a ConditionalResolver to determine the object value based
 # on the URL pattern in the request object.
 veniaResponse:
-  when:
-    # Requests to graphql/rest endpoints, the media library, and cache are
-    # handled by the top-level 'veniaProxy' object, which is a ProxyResolver
-    # that passes the request through to the backing Magento server.
-    - matches: request.url.pathname
-      pattern: '^/(graphql|rest)(/|$)'
-      use: veniaProxy
-    # Requests to create an account are handled by the 'veniaAppShell' object.
-    - matches: request.url.pathname
-      pattern: '^/create-account'
-      use: veniaAppShell
-    # Requests for static resources provided by the application project, such
-    # as icons, manifests, and static images, are handled by the top-level
-    # 'veniaStatic' object, which defines a DirectoryResolver that serves assets
-    # from the './static' folder in the project.
-    - matches: request.url.pathname
-      pattern: '^/(icons/.+|favicon.ico$|manifest.json$|.+\\.(png|svg)|robots.txt$)'
-      use: veniaStatic
-    # Requests with a URL key are handled by the top-level 'veniaAppShell'
-    # object.
-    # The existence of a URL key is determined using the top-level
-    # 'veniaUrlKey' object.
-    - matches: veniaUrlKey
-      pattern: '.'
-      use: veniaAppShell
-    # Requests to the document root, i.e. having no URL key, is also handled
-    # by the top-level 'veniaAppShell' object.
-    - matches: request.url.pathname
-      pattern: '^/$'
-      use: veniaAppShell
-  # If the none of the tested conditions pass, the default handler for the
-  # request is the top-level 'veniaBundles' object, which is a
-  # DirectoryResolver that serves the Webpack output assets from the './dist'
-  # folder.
-  default: veniaBundles
+    resolver: conditional
+    when:
+        # Requests to graphql/rest endpoints, the media library, and cache are
+        # handled by the top-level 'veniaProxy' object, which is a ProxyResolver
+        # that passes the request through to the backing Magento server.
+        - matches: request.url.pathname
+          pattern: '^/(graphql|rest)(/|$)'
+          use: veniaProxy
+        - matches: request.url.pathname
+          pattern: '^/(robots\.txt|favicon\.ico|manifest\.json)'
+          use: staticFromRoot
+        - matches: fileExtension
+          pattern: '(js|json|png|svg|ico|css|txt)'
+          use: veniaStatic
+    default: veniaAppShell
+
+# A FileResolver for serving certain files directly from document root,
+# even though they are published to the `static` folder in build assets.
+staticFromRoot:
+    inline:
+        status: 200
+        headers:
+            resolver: inline
+            inline:
+                content-type: contentTypeFromExtension
+        body:
+            resolver: file
+            file:
+                resolver: template
+                engine: mustache
+                provide:
+                    filename: request.url.pathname
+                template:
+                    resolver: inline
+                    inline: './static/{{ filename }}'
+
+contentTypeFromExtension:
+    when:
+        - matches: fileExtension
+          pattern: '^ico$'
+          use:
+              inline: image/x-icon
+        - matches: fileExtension
+          pattern: '^txt$'
+          use:
+              inline: text/plain
+        - matches: fileExtension
+          pattern: '^json$'
+          use:
+              inline: application/json
+    default:
+        inline: text/html
+
+# Contains the file extension--the part after the dot--of the URL path.
+fileExtension:
+    resolver: conditional
+    when:
+        - matches: request.url.pathname
+          pattern: '\.(.*)$'
+          use: $match.$1
+    default:
+        inline: ''
 
 # A ProxyResolver object that passes a request to the backend Magento
 # server defined in the MAGENTO_BACKEND_URL environment variable.
 # An UPWARD server infers this object as a ProxyResolver due to the presence
 # of the 'target' property.
 veniaProxy:
-  target: env.MAGENTO_BACKEND_URL
-  # A local Magento install may have SSH configured and untrusted,
-  # which is not a major concern, especially if containerized.
-  ignoreSSLErrors:
-    inline: true
+    resolver: proxy
+    target: env.MAGENTO_BACKEND_URL
+    # A local Magento install may have SSH configured and untrusted,
+    # which is not a major concern, especially if containerized.
+    ignoreSSLErrors:
+        resolver: inline
+        inline: true
 
 # The veniaAppShell object resolves to a response that returns server-side
 # rendered HTML containing the PWA application shell.
@@ -60,290 +89,52 @@ veniaProxy:
 # This object uses properties in the top-level 'veniaResource' object to return
 # the appropriate response values.
 veniaAppShell:
-  inline:
-    status:
-      when:
-        # To test this clause, the ConditionalResolver must evaluate the
-        # top-level `veniaResource` object.
-        # UPWARD is lazily evaluated, so if this is the first time
-        # `veniaResource` was looked up during the request, then this `matches`
-        # clause will trigger `veniaResource` to begin resolving.
-        # When `veniaResource` is resolved, it will have a model property.
-        # This ConditionalResolver checks for the presence of this property.
-        # If the property is not present, the requested resource could not be
-        # found and a 404 HTTP status is returned.
-        - matches: veniaResource.model
-          pattern: '.'
-          use: 200
-      default: 404
-    headers:
-      inline:
-        # The veniaAppShell object will always resolve to a response containing
-        # 'text/html' content.
-        content-type: 'text/html'
-    body:
-      # The body property of an veniaAppShell object is resolved using a
-      # TemplateResolver.
-      # When the top-level 'veniaResource' object resolves, it will contain
-      # information on which template file to use for the resource model type.
-      engine: mustache
-      template: veniaResource.template
-      # The TemplateResolver provides the following objects to the template
-      # context during render.
-      # See the definition for each of the listed top-level object for details
-      # on the data each one provides.
-      provide:
-        model: veniaResource.model
-        name: veniaResource.name
-        entityTypeName: veniaResource.entityTypeName
-        assets: veniaAssetManifest
-        urlResolver: veniaUrlResolver
-        env: env
-        mediaBackendURL: mediaBackendURL
-        site:
-          inline:
-            name:
-              inline: Venia
-
-# The veniaResource object provides information about the page type and which
-# template to use for a requested resource.
-# It uses a ConditionalResolver on the top-level 'veniaUrlResolver' object to
-# determine its 'model' and 'template' properties.
-# See the definition of the 'veniaUrlResolver' object for details on how it
-# determines the page type based on the request URL.
-veniaResource:
-  when:
-    # This entry makes '/search.html' a valid resource path. It uses a simple
-    # inline object as its resolve data and uses the generic shell as its
-    # template file.
-    - matches: request.url.pathname
-      pattern: '/search.html'
-      use:
-        inline:
-          entityTypeName:
-            inline: "Search Results"
-          template: './templates/generic-shell.mst'
-    # This entry makes '/create-account' a valid resource path.
-    - matches: request.url.pathname
-      pattern: '/create-account'
-      use:
-        inline:
-          model: veniaCreateAccountModel
-          name: veniaCreateAccountModel.title
-          entityTypeName:
-            inline: "Create Account Page"
-          template: './templates/generic-shell.mst'
-    # As with all other context values, `veniaUrlResolver` begins resolving the
-    # first time its value is requested.
-    # If UPWARD has not yet queried the GraphQL service before evaluating this
-    # match clause, then it does so now.
-    - matches: veniaUrlResolver.type
-      pattern: 'CMS_PAGE'
-      use:
-        inline:
-          # See the top-level 'veniaCmsPage' object for details on its resolved
-          # data
-          model: veniaCmsPage
-          name: veniaCmsPage.title
-          entityTypeName:
-            inline: "Page"
-          template: './templates/cmspage-shell.mst'
-    - matches: veniaUrlResolver.type
-      pattern: 'CATEGORY'
-      use:
-        inline:
-          # See the top-level 'veniaCategory' object for details on its
-          # resolved data
-          model: veniaCategory
-          name: veniaCategory.name
-          entityTypeName:
-            inline: "Category"
-          template: './templates/category-shell.mst'
-    - matches: veniaUrlResolver.type
-      pattern: 'PRODUCT'
-      use:
-        inline:
-          # See the top-level 'veniaProduct' object for details on its resolved
-          # data
-          model: veniaProduct
-          name: veniaProduct.name
-          entityTypeName:
-            inline: "Product Details"
-          template: './templates/product-shell.mst'
-    # CMS_PAGE, CATEGORY, and PRODUCT are known page types with specific
-    # data models and template files for each type.
-    # The following condition handles the case where the veniaUrlResolver object
-    # contains an unknown page type.
-    # It uses the top-level 'veniaUnknownPageType' object as its resolved data
-    # and a generic shell as the template file.
-    - matches: veniaUrlResolver.type
-      pattern: '.'
-      use:
-        inline:
-          model: veniaUnknownPageType
-          name: veniaUnknownPageType.title
-          entityTypeName:
-            inline: "Page"
-          template: './templates/generic-shell.mst'
-  default:
-    # If none of the resolver conditions pass, no 'model' property is set and
-    # this resource object sets the template property to the notfound-shell
-    # template file.
-    inline:
-      template: './templates/notfound-shell.mst'
-
-# The veniaAssetManifest object is a FileResolver that returns JSON data from a
-# file generated by Webpack. This file contains a list of all the "bundle"
-# and "chunk" filenames generated by the last Webpack build. Using this data,
-# the templates can render dynamic script tags based on the filenames of the
-# most recent build assets.
-#
-# NOTE: This object uses the shorthand syntax for a FileResolver to help with
-# readability and as a convenience.
-veniaAssetManifest: ./asset-manifest.json
-
-# The veniaUnknownPageType object contains a single 'title' property that is
-# used in the template file as the page title.
-# The top-level 'veniaResource' object uses this object as the model data for
-# page types it does not support.
-veniaUnknownPageType:
-  inline:
-    title: 'Unknown page type'
-
-# The veniaUrlResolver object is an object containing only the relevant
-# data from the top-level 'veniaUrlResolverResult' object, which is a
-# ServiceResolver.
-#
-# NOTE: Extracting smaller objects from large or deeply nesting data objects
-# is a pattern used to enhance readability and avoid long "dot lookup" strings
-veniaUrlResolver: veniaUrlResolverResult.data.urlResolver
-
-# The veniaUrlResolverResult object is a ServiceResolver that returns data from
-# a GraphQL backing service, whose URL is resolved in the top-level
-# 'magentoGQL' object.
-#
-# This object retrieves information from Magento about the request path,
-# so the PWA can respect redirects and routes controlled by the admin.
-#
-# NOTE: The UPWARD server is able to interpret this entry as a ServiceResolver
-# because of the presence of the 'query' property, which itself uses the
-# shorthand syntax for a FileResolver.
-veniaUrlResolverResult:
-  url: magentoGQL
-  query: './lib/queries/urlResolver.graphql'
-  variables:
+    resolver: inline
     inline:
-      urlKey: request.url.pathname
-
-# Extract base media URL from ServiceResolver result
-mediaBackendURL: mediaBackendResult.data.storeConfig.secure_base_media_url
-
-# Retrieve base media URL with ServiceResolver query
-mediaBackendResult:
-  url: magentoGQL
-  query:
-    inline: 'query { storeConfig { secure_base_media_url } }'
-
-# The magentoGQL object is a UrlResolver that returns the URL for the
-# GraphQL endpoint using the MAGENTO_BACKEND_URL environment variable.
-magentoGQL:
-  baseUrl: env.MAGENTO_BACKEND_URL
-  pathname:
-    inline: graphql
-
-# The veniaProduct object is an object containing only the relevant data from
-# the top-level 'veniaProductResult' object.
-veniaProduct: veniaProductResult.data.productDetail.items.0
-
-# The veniaProductResult object is a ServiceResolver that returns data from a
-# GraphQL backing service, whose URL is resolved in the top-level 'magentoGQL'
-# object.
-#
-# This object retrieves information about a specific product.
-veniaProductResult:
-  url: magentoGQL
-  query: './lib/queries/getProductDetail.graphql'
-  variables:
-    inline:
-      onServer: true
-      urlKey: veniaUrlKey
-      id: veniaUrlResolver.id
-
-# The veniaCategory object is an object containing only the relevant data from
-# the top-level 'veniaCategoryResult' object.
-veniaCategory: veniaCategoryResult.data.category
-
-# The veniaCategoryResult object is a ServiceResolver that returns data from a
-# GraphQL backing service, whose URL is resolved in the top-level 'magentoGQL'
-# object.
-#
-# This object retrieves information about a specific category.
-veniaCategoryResult:
-  url: magentoGQL
-  query: './lib/queries/getCategory.graphql'
-  variables:
-    inline:
-      onServer: true
-      id: veniaUrlResolver.id
-      pageSize:
-        inline: 1
-      currentPage:
-        inline: 1
-
-# The veniaCmsPage object is an object containing only the relevant data from
-# the top-level 'veniaCmsPageResult' object.
-veniaCmsPage: veniaCmsPageResult.data.cmsPage
-
-# The veniaCmsPageResult object is a ServiceResolver that returns data from a
-# GraphQL backing service, whose URL is resolved in the top-level 'magentoGQL'
-# object.
-#
-# This object retrieves information about a specific CMS page.
-veniaCmsPageResult:
-  url: magentoGQL
-  query: './lib/queries/getCmsPage.graphql'
-  variables:
-    inline:
-      onServer: true
-      id: veniaUrlResolver.id
-
-# The veniaUrlKey object returns the value of the URL key from the request path
-veniaUrlKey:
-  when:
-    - matches: request.url.pathname
-      pattern: '^/(?:(.*)\.html)?'
-      use: $match.$1
-  default:
-    inline: ''
-
-# The veniaBundles object is a DirectoryResolver that allows access to the
-# bundled files in the project's './dist' diretory.
-#
-# NOTE: The UPWARD server is able to interpret this entry as a
-# DirectoryResolver because of the presence of the 'directory' property.
-veniaBundles:
-  directory:
-    inline: '.'
-
-# The veniaCreateAccountModel object contains a single 'title' property that is
-# used in the template file as the page title.
-veniaCreateAccountModel:
-  inline:
-    title:
-      inline: 'Create Account'
+        status:
+            resolver: inline
+            inline: 200
+        headers:
+            resolver: inline
+            inline:
+                content-type:
+                    inline: text/html
+        body:
+            resolver: file
+            file:
+                resolver: inline
+                inline: './index.html'
 
 # The veniaStatic object is a DirectoryResolver that allows access to the files
-# inside the project's './static' directory.
+# inside the project's compiled './dist' directory.
 veniaStatic:
-  directory:
-    inline: './static'
-
-# This is a no-op at runtime; nothing refers to this context value in the rest
-# of this file. It exists to declare that template evaluation requires _all_
-# files in `./templates`, not just the ones detected by mention in this file.
-# This is the only way that the UpwardIncludePlugin dependency detector can
-# know about the _template partials_, which are only used inside template
-# evaluation and cannot be easily statically analyzed by the plugin.
-#
-# TLDR: mentioning './templates' makes Webpack copy the whole dir into ./dist
-veniaTemplateIncludes: './templates'
+    resolver: directory
+    directory:
+        resolver: inline
+        inline: '.'
+
+# These are no-ops at runtime; nothing refers to these context values in the
+# rest of this file. They exist to declare that the files in the `./templates`
+# and `./static` directories are required and should be copied into the build
+# assets by the UpwardIncludePlugin. Since they are not directly mentioned
+# elsewhere in this file or any other upward.yml file in the build, the
+# UpwardIncludePlugin would fail to copy them if they were not mentioned here.
+
+# The templates directory includes partials which are only required by other
+# templates, and the UpwardIncludePlugin cannot parse templates to see them.
+veniaTemplateIncludes:
+    resolver: directory
+    directory:
+        resolver: inline
+        inline: './templates'
+
+# The static directory includes files which don't need to be compiled.
+# They are served by the `veniaStatic` DirectoryResolver, along with the
+# bundles and other assets, but since that resolver serves the `.` dist
+# directory, the UpwardIncludePlugin will not copy it to avoid circular
+# dependency. TODO: This is kind of confusing.
+veniaStaticIncludes:
+    resolver: directory
+    directory:
+        resolver: inline
+        inline: './static'
diff --git a/yarn.lock b/yarn.lock
index 00f1c6abf3..5e5cb136b7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4828,7 +4828,7 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camel-case@^3.0.0:
+camel-case@3.0.x, camel-case@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
   integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=
@@ -5080,7 +5080,7 @@ classnames@^2.2.5:
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
   integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
 
-clean-css@^4.2.1:
+clean-css@4.2.x, clean-css@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
   integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==
@@ -5260,11 +5260,21 @@ command-exists@^1.2.2, command-exists@^1.2.8:
   resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.8.tgz#715acefdd1223b9c9b37110a149c6392c2852291"
   integrity sha512-PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw==
 
+commander@2.17.x:
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
+  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
+
 commander@2.20.0, commander@^2.11.0, commander@^2.18.0, commander@^2.19.0, commander@^2.20.0, commander@^2.7.1, commander@^2.8.1, commander@^2.9.0, commander@~2.20.0:
   version "2.20.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
   integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
 
+commander@~2.19.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
+  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
+
 common-tags@^1.5.1, common-tags@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
@@ -8304,13 +8314,20 @@ graphql-upload@^8.0.2:
     http-errors "^1.7.2"
     object-path "^0.11.4"
 
-graphql@14.3.1, graphql@^0.13.1, graphql@^14.0.0, graphql@^14.0.2, graphql@~14.3.1:
+graphql@14.3.1, graphql@^14.0.0, graphql@^14.0.2, graphql@~14.3.1:
   version "14.3.1"
   resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.3.1.tgz#b3aa50e61a841ada3c1f9ccda101c483f8e8c807"
   integrity sha512-FZm7kAa3FqKdXy8YSSpAoTtyDFMIYSpCDOr+3EqlI1bxmtHu+Vv/I2vrSeT1sBOEnEniX3uo4wFhFdS/8XN6gA==
   dependencies:
     iterall "^1.2.2"
 
+graphql@^0.13.1:
+  version "0.13.2"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.13.2.tgz#4c740ae3c222823e7004096f832e7b93b2108270"
+  integrity sha512-QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog==
+  dependencies:
+    iterall "^1.2.1"
+
 "growl@~> 1.10.0":
   version "1.10.5"
   resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
@@ -8465,7 +8482,7 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-he@^1.2.0:
+he@1.2.x, he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
@@ -8565,6 +8582,19 @@ html-entities@^1.2.0:
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
   integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
 
+html-minifier@^3.2.3:
+  version "3.5.21"
+  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz#d0040e054730e354db008463593194015212d20c"
+  integrity sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==
+  dependencies:
+    camel-case "3.0.x"
+    clean-css "4.2.x"
+    commander "2.17.x"
+    he "1.2.x"
+    param-case "2.1.x"
+    relateurl "0.2.x"
+    uglify-js "3.4.x"
+
 html-minifier@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-4.0.0.tgz#cca9aad8bce1175e02e17a8c33e46d8988889f56"
@@ -8590,6 +8620,19 @@ html-webpack-plugin@^4.0.0-beta.2:
     tapable "^1.1.3"
     util.promisify "1.0.0"
 
+html-webpack-plugin@~3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
+  integrity sha1-sBq71yOsqqeze2r0SS69oD2d03s=
+  dependencies:
+    html-minifier "^3.2.3"
+    loader-utils "^0.2.16"
+    lodash "^4.17.3"
+    pretty-error "^2.0.2"
+    tapable "^1.0.0"
+    toposort "^1.0.0"
+    util.promisify "1.0.0"
+
 htmlparser2@^3.3.0, htmlparser2@^3.9.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
@@ -10404,6 +10447,16 @@ loader-utils@1.2.3, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.
     emojis-list "^2.0.0"
     json5 "^1.0.1"
 
+loader-utils@^0.2.16:
+  version "0.2.17"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
+  integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=
+  dependencies:
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+    object-assign "^4.0.1"
+
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -10575,7 +10628,7 @@ lodash@4.17.5:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
   integrity sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==
 
-lodash@^4.0.0, lodash@^4.11.1, lodash@^4.15.0, lodash@^4.16.0, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@~4.17.11:
+lodash@^4.0.0, lodash@^4.11.1, lodash@^4.15.0, lodash@^4.16.0, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@~4.17.11:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -11284,7 +11337,7 @@ node-fetch@^1.0.1, node-fetch@^1.7.3:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
-node-fetch@^2.1.2, node-fetch@^2.2.0, node-fetch@^2.3.0:
+node-fetch@^2.1.2, node-fetch@^2.2.0, node-fetch@^2.3.0, node-fetch@~2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
   integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
@@ -12060,7 +12113,7 @@ parallel-transform@^1.1.0:
     inherits "^2.0.3"
     readable-stream "^2.1.5"
 
-param-case@^2.1.0, param-case@^2.1.1:
+param-case@2.1.x, param-case@^2.1.0, param-case@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
   integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc=
@@ -12621,7 +12674,7 @@ pretty-bytes@^5.1.0:
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.3.0.tgz#f2849e27db79fb4d6cfe24764fc4134f165989f2"
   integrity sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg==
 
-pretty-error@^2.1.1:
+pretty-error@^2.0.2, pretty-error@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
   integrity sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=
@@ -13706,7 +13759,7 @@ regjsparser@^0.6.0:
   dependencies:
     jsesc "~0.5.0"
 
-relateurl@^0.2.7:
+relateurl@0.2.x, relateurl@^0.2.7:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
   integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
@@ -15437,6 +15490,11 @@ toidentifier@1.0.0:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
+toposort@^1.0.0:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
+  integrity sha1-LmhELZ9k7HILjMieZEOsbKqVACk=
+
 tough-cookie@^2.3.3, tough-cookie@^2.3.4:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
@@ -15549,6 +15607,14 @@ ua-parser-js@^0.7.18:
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.20.tgz#7527178b82f6a62a0f243d1f94fd30e3e3c21098"
   integrity sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw==
 
+uglify-js@3.4.x:
+  version "3.4.10"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"
+  integrity sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==
+  dependencies:
+    commander "~2.19.0"
+    source-map "~0.6.1"
+
 uglify-js@^3.1.4, uglify-js@^3.5.1:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz#704681345c53a8b2079fb6cec294b05ead242ff5"