diff --git a/.github/actions/run-docker/action.yml b/.github/actions/run-docker/action.yml
index 1619f498eb95..dea9fdd64908 100644
--- a/.github/actions/run-docker/action.yml
+++ b/.github/actions/run-docker/action.yml
@@ -23,10 +23,6 @@ inputs:
     description: 'Docker target to run (development|production)'
     required: false
     default: 'production'
-  mount:
-    description: 'Mount host files at runtime? (development|production)'
-    required: false
-    default: 'production'
   deps:
     description: 'Which dependencies to install at runtime? (development|production)'
     required: false
@@ -44,7 +40,6 @@ runs:
           DOCKER_DIGEST="${{ inputs.digest }}" \
           DOCKER_TARGET="${{ inputs.target }}" \
           OLYMPIA_UID="$(id -u)" \
-          OLYMPIA_MOUNT="${{ inputs.mount }}" \
           OLYMPIA_DEPS="${{ inputs.deps }}" \
           DATA_BACKUP_SKIP="${{ inputs.data_backup_skip }}" \
           DOCKER_WAIT="true"
diff --git a/.github/workflows/_test_check.yml b/.github/workflows/_test_check.yml
index eebd0f900289..88ec6f90ecb6 100644
--- a/.github/workflows/_test_check.yml
+++ b/.github/workflows/_test_check.yml
@@ -46,7 +46,6 @@ jobs:
     name: |
       version: '${{ matrix.version }}' |
       target: '${{ matrix.target }}' |
-      mount: '${{ matrix.mount }}' |
       deps: '${{ matrix.deps }}'
     strategy:
       fail-fast: false
@@ -57,9 +56,6 @@ jobs:
         target:
           - development
           - production
-        mount:
-          - development
-          - production
         deps:
           - development
           - production
@@ -72,7 +68,6 @@ jobs:
             Values passed to the action:
             version: ${{ matrix.version }}
             target: ${{ matrix.target }}
-            mount: ${{ matrix.mount }}
             deps: ${{ matrix.deps }}
           EOF
       - name: ${{ matrix.version == 'local' && 'Uncached Build' || 'Pull' }} Check
@@ -84,7 +79,6 @@ jobs:
         with:
           version: ${{ matrix.version }}
           target: ${{ matrix.target }}
-          mount: ${{ matrix.mount }}
           deps: ${{ matrix.deps }}
           run: make check
       - name: Cached Build Check
@@ -93,7 +87,6 @@ jobs:
         with:
           version: ${{ matrix.version }}
           target: ${{ matrix.target }}
-          mount: ${{ matrix.mount }}
           deps: ${{ matrix.deps }}
           run: echo true
 
diff --git a/.github/workflows/_test_main.yml b/.github/workflows/_test_main.yml
index 38457e047a11..cd69c91de696 100644
--- a/.github/workflows/_test_main.yml
+++ b/.github/workflows/_test_main.yml
@@ -88,7 +88,6 @@ jobs:
           services: ''
           digest: ${{ inputs.digest }}
           version: ${{ inputs.version }}
-          mount: development
           deps: development
           run: |
             split="--splits ${{ needs.test_config.outputs.splits }}"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d782354e3346..743afda17c0c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -87,7 +87,6 @@ jobs:
         with:
           digest: ${{ needs.build.outputs.digest }}
           version: ${{ needs.build.outputs.version }}
-          mount: development
           deps: development
           target: development
           run: |
@@ -140,7 +139,6 @@ jobs:
         with:
           digest: ${{ needs.build.outputs.digest }}
           version: ${{ needs.build.outputs.version }}
-          mount: development
           deps: development
           run: make extract_locales
 
diff --git a/.gitignore b/.gitignore
index d2a01bd4f2c1..8bf5971cf22d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,5 @@ tmp/*
 !private/README.md
 !storage/.gitignore
 !deps/.gitkeep
+!site-static/.gitkeep
+!static-build/.gitkeep
diff --git a/Dockerfile b/Dockerfile
index ff4bd52bbab2..06c019eb800b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -148,6 +148,9 @@ EOF
 
 FROM base AS development
 
+# Copy build info from info
+COPY --from=info ${BUILD_INFO} ${BUILD_INFO}
+
 FROM base AS locales
 ARG LOCALE_DIR=${HOME}/locale
 # Compile locales
@@ -157,7 +160,7 @@ COPY --chown=olympia:olympia locale ${LOCALE_DIR}
 RUN \
     --mount=type=bind,source=requirements/locale.txt,target=${HOME}/requirements/locale.txt \
     --mount=type=bind,source=Makefile-docker,target=${HOME}/Makefile-docker \
-    --mount=type=bind,source=locale/compile-mo.sh,target=${HOME}/compile-mo.sh \
+    --mount=type=bind,source=scripts/compile_locales.py,target=${HOME}/scripts/compile_locales.py \
     make -f Makefile-docker compile_locales
 
 # More efficient caching by mounting the exact files we need
@@ -175,12 +178,12 @@ COPY --chown=olympia:olympia static/ ${HOME}/static/
 # Run that command without having to copy the whole source code
 # This will shave nearly 1 minute off the best case build time
 RUN \
-    --mount=type=bind,src=src,target=${HOME}/src \
     --mount=type=bind,src=Makefile-docker,target=${HOME}/Makefile-docker \
+    --mount=type=bind,src=src,target=${HOME}/src \
+    --mount=type=bind,src=scripts/update_assets.py,target=${HOME}/scripts/update_assets.py \
     --mount=type=bind,src=manage.py,target=${HOME}/manage.py \
 <<EOF
-echo "from olympia.lib.settings_base import *" > settings_local.py
-DJANGO_SETTINGS_MODULE="settings_local" make -f Makefile-docker update_assets
+make -f Makefile-docker update_assets
 EOF
 
 FROM base AS production
diff --git a/Makefile-docker b/Makefile-docker
index 2630b30e2902..2039d0d36a4e 100644
--- a/Makefile-docker
+++ b/Makefile-docker
@@ -45,14 +45,8 @@ data_load:
 	./manage.py data_load $(ARGS)
 
 .PHONY: update_assets
-update_assets:
-	# Copy files required in compress_assets to the static folder
-	# If changing this here, make sure to adapt tests in amo/test_commands.py
-	$(PYTHON_COMMAND) manage.py compress_assets
-	$(PYTHON_COMMAND) manage.py generate_jsi18n_files
-	# Collect static files: This MUST be run last or files will be missing
-	$(PYTHON_COMMAND) manage.py collectstatic --noinput
-
+update_assets: ## Update the static assets
+	$(HOME)/scripts/update_assets.py
 
 .PHONY: update_deps
 update_deps: ## Update the dependencies
@@ -191,7 +185,7 @@ extract_locales: ## extracts and merges translation strings
 .PHONE: compile_locales
 compile_locales: ## compiles translation strings
 	$(PIP_COMMAND) install --progress-bar=off --no-deps -r requirements/locale.txt
-	./locale/compile-mo.sh ./locale/
+	$(HOME)/scripts/compile_locales.py
 
 .PHONY: help_submake
 help_submake:
diff --git a/Makefile-os b/Makefile-os
index e3079503fcd3..15fbe78fd8f7 100644
--- a/Makefile-os
+++ b/Makefile-os
@@ -153,21 +153,22 @@ docker_clean_build_cache: ## Remove buildx build cache
 .PHONY: clean_docker
 clean_docker: docker_compose_down docker_mysqld_volume_remove docker_clean_images docker_clean_volumes docker_clean_build_cache ## Remove all docker resources taking space on the host machine
 
-.PHONY: docker_update_deps
-docker_update_deps: docker_mysqld_volume_create ## Update the dependencies in the container based on the docker tag and target
+.PHONY: docker_sync_host
+docker_sync_host: docker_mysqld_volume_create ## Update the dependencies in the container based on the docker tag and target
 	docker compose run \
 		--rm \
 		--no-deps \
 		$(DOCKER_RUN_ARGS) \
 		web \
-		make update_deps
+		./scripts/sync_host_files.py
 
 .PHONY: up_pre
-up_pre: setup docker_pull_or_build docker_update_deps ## Pre-up the environment, setup files, volumes and host state
+up_pre: setup docker_pull_or_build docker_sync_host ## Pre-up the environment, setup files, volumes and host state
 
 .PHONY: up_start
 up_start: docker_mysqld_volume_create ## Start the docker containers
 	docker compose up $(DOCKER_COMPOSE_ARGS) $(ARGS)
+	docker compose rm olympia_volumes -f
 
 .PHONY: up_post
 up_post: docker_clean_images docker_clean_volumes ## Post-up the environment, setup files, volumes and host state
diff --git a/docker-compose.yml b/docker-compose.yml
index 8671855728e6..7e4caaaf81fe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -45,7 +45,7 @@ services:
     command: ["sleep", "infinity"]
     volumes:
       # used by: web, worker, nginx
-      - ${HOST_MOUNT_SOURCE:?}:/data/olympia
+      - ./:/data/olympia
   worker:
     <<: *olympia
     command: [
@@ -60,7 +60,7 @@ services:
       "celery -A olympia.amo.celery:app worker -E -c 2 --loglevel=INFO",
     ]
     volumes:
-      - ${HOST_MOUNT_SOURCE:?}:/data/olympia
+      - ./:/data/olympia
     extra_hosts:
      - "olympia.test:127.0.0.1"
     restart: on-failure:5
@@ -93,7 +93,7 @@ services:
     image: nginx
     volumes:
       - data_nginx:/etc/nginx/conf.d
-      - ${HOST_MOUNT_SOURCE:?}:/srv
+      - ./:/srv
     ports:
       - "80:80"
     networks:
@@ -192,15 +192,6 @@ networks:
     enable_ipv6: false
 
 volumes:
-  # Volumes for the production olympia mounts
-  # allowing to conditionally mount directories
-  # from the host or from the image to <path>
-  # in the running docker container.
-  # If OLYMPIA_MOUNT_SOURCE matches (data_olympia_)
-  # then we use the production volume mounts. Otherwise
-  # it will map to the current directory ./<name>
-  # (data_olympia_)<name>:/<path>
-  data_olympia_:
   # Volume for rabbitmq/redis to avoid anonymous volumes
   data_rabbitmq:
   data_redis:
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 5dfe6ad22e0e..06aca156b3c0 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -30,12 +30,6 @@ fi
 NEW_HOST_UID=$(get_olympia_uid)
 OLYMPIA_ID_STRING="${NEW_HOST_UID}:$(get_olympia_gid)"
 
-# If we are on production mode, update the ownership of /data/olympia to match the new id
-if [[ "${HOST_MOUNT}" == "production" ]]; then
-  echo "Updating ownership of ${HOME} to ${OLYMPIA_ID_STRING}"
-  chown -R ${OLYMPIA_ID_STRING} ${HOME}
-fi
-
 cat <<EOF | su -s /bin/bash $OLYMPIA_USER
   echo "Running command as ${OLYMPIA_USER} ${OLYMPIA_ID_STRING}"
   set -xue
diff --git a/docker/nginx/addons.conf b/docker/nginx/addons.conf
index ff6bb2e6f975..89f00d702fcc 100644
--- a/docker/nginx/addons.conf
+++ b/docker/nginx/addons.conf
@@ -10,10 +10,15 @@ server {
         alias /srv/storage/;
     }
 
-    location /static/ {
-        alias /srv/site-static/;
-        try_files $uri @olympia;
+    location ~ ^/static/(.*)$ {
         add_header X-Served-By "nginx" always;
+
+        # "root /srv" as we mount all files in this directory
+        root /srv;
+
+        # If it doesn't exist under /srv/site-static/$1,
+        # fall back to /srv/static/$1, else forward to @olympia
+        try_files /site-static/$1 /static/$1 @olympia;
     }
 
     location /user-media/ {
diff --git a/locale/compile-mo.sh b/locale/compile-mo.sh
deleted file mode 100755
index d50a894a7f19..000000000000
--- a/locale/compile-mo.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-# syntax:
-# compile-mo.sh locale-dir/
-
-# Make this script fail if any command exits wit exit code != 0
-set -ue
-
-function process_po_file() {
-    pofile=$1
-    dir=$(dirname "$pofile")
-    lang=$(echo "$pofile" | cut -d "/" -f2)
-    stem=$(basename "$pofile" .po)
-    touch "${dir}/${stem}.mo"
-    dennis-cmd lint --errorsonly "$pofile" && msgfmt -o "${dir}/${stem}.mo" "$pofile"
-}
-
-# We are spawning sub processes with `xargs`
-# and the function needs to be available in that sub process
-export -f process_po_file
-
-function usage() {
-    echo "syntax:"
-    echo "compile-mo.sh locale-dir/"
-    exit 1
-}
-
-# check if file and dir are there
-if [[ ($# -ne 1) || (! -d "$1") ]]; then usage; fi
-
-# Ensure dennis-cmd cli is available in the environment
-hash dennis-cmd
-
-echo "compiling django.po..."
-find $1 -type f -name "django.po" -print0 | xargs -0 -n1 -P4 bash -c 'process_po_file "$@"' _
-
-echo "compiling djangojs.po..."
-find $1 -type f -name "djangojs.po" -print0 | xargs -0 -n1 -P4 bash -c 'process_po_file "$@"' _
diff --git a/scripts/compile_locales.py b/scripts/compile_locales.py
new file mode 100755
index 000000000000..17e0e663cbc4
--- /dev/null
+++ b/scripts/compile_locales.py
@@ -0,0 +1,71 @@
+#!/usr/bin/env python3
+
+import os
+import subprocess
+from concurrent.futures import ThreadPoolExecutor
+
+
+def process_po_file(pofile, attempt=0):
+    """Process a single .po file, creating corresponding .mo file."""
+    print('processing', pofile)
+    directory = os.path.dirname(pofile)
+    stem = os.path.splitext(os.path.basename(pofile))[0]
+    mo_path = os.path.join(directory, f'{stem}.mo')
+
+    # Touch the .mo file
+    open(mo_path, 'a').close()
+
+    try:
+        # Run dennis-cmd lint
+        subprocess.run(
+            ['dennis-cmd', 'lint', '--errorsonly', pofile],
+            capture_output=True,
+            check=False,
+        )
+        # If lint passes, run msgfmt
+        subprocess.run(['msgfmt', '-o', mo_path, pofile], check=True)
+        return
+    except subprocess.CalledProcessError as e:
+        if attempt < 3:
+            print(f'Failed attempt {attempt} for {pofile}, retrying...')
+            return process_po_file(pofile, attempt=attempt + 1)
+        raise e
+
+
+def main():
+    # Ensure 'dennis' is installed
+    try:
+        import dennis as _
+    except ImportError:
+        print(
+            'Error: dennis is not installed. Please install it with pip install dennis'
+        )
+        exit(1)
+
+    locale_dir = os.path.abspath(
+        os.path.join(
+            os.path.dirname(__file__),
+            '..',
+            'locale',
+        )
+    )
+
+    print(f'Compiling locales in {locale_dir}')
+
+    # Collect all files first
+    django_files = []
+    djangojs_files = []
+    for root, _, files in os.walk(locale_dir):
+        for file in files:
+            if file == 'django.po':
+                django_files.append(os.path.join(root, file))
+            elif file == 'djangojs.po':
+                djangojs_files.append(os.path.join(root, file))
+
+    # Process django.po files in parallel
+    with ThreadPoolExecutor() as executor:
+        executor.map(process_po_file, django_files + djangojs_files)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/setup.py b/scripts/setup.py
index 27d49e71817c..aefd1b783265 100755
--- a/scripts/setup.py
+++ b/scripts/setup.py
@@ -75,27 +75,6 @@ def get_docker_image_meta():
     return tag, target, version, digest
 
 
-def get_olympia_mount(docker_target):
-    """
-    When running on production targets, the user can specify the olympia mount
-    to one of the valid values: development or production. In development, we
-    hard code the values to ensure we have necessary files and permissions.
-    """
-    dev_source = './'
-    prod_source = 'data_olympia_'
-    olympia_mount = docker_target
-    olympia_mount_source = dev_source if docker_target == 'development' else prod_source
-
-    if (
-        docker_target == 'production'
-        and os.environ.get('OLYMPIA_MOUNT') == 'development'
-    ):
-        olympia_mount = 'development'
-        olympia_mount_source = dev_source
-
-    return olympia_mount, olympia_mount_source
-
-
 # Env file should contain values that are referenced in docker-compose*.yml files
 # so running docker compose commands produce consistent results in terminal and make.
 # These values should not be referenced directly in the make file.
@@ -114,7 +93,6 @@ def main():
     docker_tag, docker_target, _, _ = get_docker_image_meta()
 
     olympia_uid = os.getuid()
-    olympia_mount, olympia_mount_source = get_olympia_mount(docker_target)
 
     # These variables are special, as we should allow the user to override them
     # but we should not set a default to the previously set value but instead
@@ -132,10 +110,6 @@ def main():
             # These values are mapped back to the olympia_* values in the environment
             # of the container so everywhere they can be referenced as the user expects.
             'HOST_UID': olympia_uid,
-            'HOST_MOUNT': olympia_mount,
-            # Save the docker compose volume name
-            # to use as the source of the /data/olympia volume
-            'HOST_MOUNT_SOURCE': olympia_mount_source,
             'DEBUG': debug,
             'OLYMPIA_DEPS': olympia_deps,
         }
diff --git a/scripts/sync_host_files.py b/scripts/sync_host_files.py
new file mode 100755
index 000000000000..2d9f7a53d0cc
--- /dev/null
+++ b/scripts/sync_host_files.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+
+import json
+import os
+import subprocess
+
+
+def main():
+    BUILD_INFO = os.environ.get('BUILD_INFO')
+
+    subprocess.run(['make', 'update_deps'], check=True)
+
+    with open(BUILD_INFO, 'r') as f:
+        build_info = json.load(f)
+
+    print('build_info', build_info)
+
+    if build_info.get('target') == 'production':
+        subprocess.run(['make', 'compile_locales'], check=True)
+        subprocess.run(['make', 'update_assets'], check=True)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/update_assets.py b/scripts/update_assets.py
new file mode 100755
index 000000000000..777d9ad96529
--- /dev/null
+++ b/scripts/update_assets.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+
+import os
+import shutil
+import subprocess
+
+
+def main():
+    """
+    Update the static assets served by addons-server for production.
+    """
+    HOME = os.environ.get('HOME')
+
+    for dir in ['static-build', 'site-static']:
+        path = os.path.join(HOME, dir)
+        if os.path.exists(path):
+            shutil.rmtree(path)
+        os.makedirs(path, exist_ok=True)
+        open(os.path.join(path, '.gitkeep'), 'w').close()
+
+    script_prefix = ['python3', 'manage.py']
+
+    environment = os.environ.copy()
+    environment['DJANGO_SETTINGS_MODULE'] = 'olympia.lib.settings_base'
+
+    subprocess.run(
+        script_prefix + ['compress_assets'],
+        check=True,
+        env=environment,
+        capture_output=False,
+    )
+    subprocess.run(
+        script_prefix + ['generate_jsi18n_files'],
+        check=True,
+        env=environment,
+        capture_output=False,
+    )
+    subprocess.run(
+        script_prefix + ['collectstatic', '--noinput'],
+        check=True,
+        env=environment,
+        capture_output=False,
+    )
+
+
+if __name__ == '__main__':
+    main()
diff --git a/settings.py b/settings.py
index ad6b13112338..e60dbf2a5eda 100644
--- a/settings.py
+++ b/settings.py
@@ -19,7 +19,6 @@
 DEV_MODE = DOCKER_TARGET != 'production'
 
 HOST_UID = os.environ.get('HOST_UID')
-HOST_MOUNT = os.environ.get('HOST_MOUNT')
 
 WSGI_APPLICATION = 'olympia.wsgi.application'
 
diff --git a/site-static/.gitkeep b/site-static/.gitkeep
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/src/olympia/amo/management/commands/initialize.py b/src/olympia/amo/management/commands/initialize.py
index b4ab11e67a65..620bde565c1a 100644
--- a/src/olympia/amo/management/commands/initialize.py
+++ b/src/olympia/amo/management/commands/initialize.py
@@ -68,12 +68,14 @@ def handle(self, *args, **options):
                     call_command(
                         'reindex', '--wipe', '--force', '--noinput', '--skip-if-exists'
                     )
-                    self.make_storage(clean=False)
 
             # By now, we excpect the database to exist, and to be migrated
             # so our database tables should be accessible
             call_command('monitors', services=['database'])
 
+        # Ensure that the storage directories exist.
+        self.make_storage(clean=False)
+
         # Ensure any additional required dependencies are available before proceeding.
         call_command(
             'monitors',
diff --git a/src/olympia/amo/tests/test_commands.py b/src/olympia/amo/tests/test_commands.py
index df6d0c7a2513..ff7368dea6a7 100644
--- a/src/olympia/amo/tests/test_commands.py
+++ b/src/olympia/amo/tests/test_commands.py
@@ -650,8 +650,8 @@ def setUp(self):
                 'olympia.amo.management.commands.data_seed.BaseDataCommand.clean_dir',
             ),
             (
-                'mock_clean_storage',
-                'olympia.amo.management.commands.data_seed.BaseDataCommand.clean_storage',
+                'mock_make_storage',
+                'olympia.amo.management.commands.data_seed.BaseDataCommand.make_storage',
             ),
         )
 
@@ -668,7 +668,7 @@ def test_default(self):
         self.mocks['mock_clean_dir'].assert_called_once_with(
             self.base_data_command.data_backup_init
         )
-        self.mocks['mock_clean_storage'].assert_called_once()
+        self.mocks['mock_make_storage'].assert_called_once()
 
         self._assert_commands_called_in_order(
             self.mocks['mock_call_command'],
diff --git a/src/olympia/core/apps.py b/src/olympia/core/apps.py
index d30d8c760849..fc51bae9e528 100644
--- a/src/olympia/core/apps.py
+++ b/src/olympia/core/apps.py
@@ -175,7 +175,7 @@ def nginx_check(app_configs, **kwargs):
         {
             'dir': settings.STATIC_FILES_PATH,
             'base_url': 'http://nginx/static/',
-            'source': 'olympia',
+            'source': 'nginx',
         },
     ]
 
diff --git a/static-build/.gitkeep b/static-build/.gitkeep
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/make/make.spec.js b/tests/make/make.spec.js
index 29875a299daf..fb9739dec556 100644
--- a/tests/make/make.spec.js
+++ b/tests/make/make.spec.js
@@ -62,18 +62,13 @@ describe('docker-compose.yml', () => {
   describe.each(
     permutations({
       DOCKER_TARGET: ['development', 'production'],
-      OLYMPIA_MOUNT: ['development', 'production'],
       DOCKER_VERSION: ['local', 'latest'],
     }),
   )('\n%s\n', (config) => {
-    const { DOCKER_TARGET, OLYMPIA_MOUNT, DOCKER_VERSION } = config;
-    const isProdTarget = DOCKER_TARGET === 'production';
-    const isProdMount = OLYMPIA_MOUNT === 'production';
-    const isProdMountTarget = isProdMount && isProdTarget;
+    const { DOCKER_TARGET, DOCKER_VERSION } = config;
 
     const inputValues = {
       DOCKER_TARGET,
-      OLYMPIA_MOUNT,
       DOCKER_VERSION,
       DEBUG: 'debug',
       DATA_BACKUP_SKIP: 'skip',
@@ -118,17 +113,13 @@ describe('docker-compose.yml', () => {
         expect(service.volumes).toEqual(
           expect.arrayContaining([
             expect.objectContaining({
-              source: isProdMountTarget ? 'data_olympia_' : expect.any(String),
+              source: expect.any(String),
               target: '/data/olympia',
             }),
           ]),
         );
-        const {
-          OLYMPIA_MOUNT,
-          DOCKER_VERSION,
-          DOCKER_TARGET,
-          ...environmentOutput
-        } = inputValues;
+        const { DOCKER_VERSION, DOCKER_TARGET, ...environmentOutput } =
+          inputValues;
         expect(service.environment).toEqual(
           expect.objectContaining({
             ...environmentOutput,
@@ -163,7 +154,7 @@ describe('docker-compose.yml', () => {
           }),
           // mapping for /data/olympia/ directory to /srv
           expect.objectContaining({
-            source: isProdMountTarget ? 'data_olympia_' : expect.any(String),
+            source: expect.any(String),
             target: '/srv',
           }),
         ]),
@@ -263,7 +254,6 @@ describe('docker-compose.yml', () => {
   const ignoreKeys = [
     // Ignored because these values are explicitly mapped to the host_* values
     'OLYMPIA_UID',
-    'OLYMPIA_MOUNT',
     // Ignored because the HOST_UID is always set to the host user's UID
     'HOST_UID',
   ];
diff --git a/tests/make/test_setup.py b/tests/make/test_setup.py
index 97d5b82fdc5b..47f4a9a97df0 100644
--- a/tests/make/test_setup.py
+++ b/tests/make/test_setup.py
@@ -10,8 +10,6 @@
     'DOCKER_TAG',
     'DOCKER_TARGET',
     'HOST_UID',
-    'HOST_MOUNT',
-    'HOST_MOUNT_SOURCE',
     'OLYMPIA_DEPS',
     'DEBUG',
 ]
@@ -184,44 +182,6 @@ def test_debug_override(self):
         self.assert_set_env_file_called_with(DEBUG='test')
 
 
-@override_env()
-class TestHostMount(BaseTestClass):
-    def test_default_host_mount(self):
-        main()
-        self.assert_set_env_file_called_with(
-            HOST_MOUNT='development', HOST_MOUNT_SOURCE='./'
-        )
-
-    @override_env(DOCKER_TARGET='production')
-    def test_host_mount_set_by_docker_target(self):
-        main()
-        self.assert_set_env_file_called_with(
-            HOST_MOUNT='production', HOST_MOUNT_SOURCE='data_olympia_'
-        )
-
-    @override_env(DOCKER_TARGET='production', OLYMPIA_MOUNT='test')
-    def test_invalid_host_mount_set_by_env_ignored(self):
-        main()
-        self.assert_set_env_file_called_with(
-            HOST_MOUNT='production', HOST_MOUNT_SOURCE='data_olympia_'
-        )
-
-    @override_env(DOCKER_TARGET='development', OLYMPIA_MOUNT='production')
-    def test_host_mount_overriden_by_development_target(self):
-        main()
-        self.assert_set_env_file_called_with(
-            HOST_MOUNT='development', HOST_MOUNT_SOURCE='./'
-        )
-
-    @override_env(DOCKER_TARGET='production')
-    def test_host_mount_from_file_ignored(self):
-        self.mock_get_env_file.return_value = {'HOST_MOUNT': 'development'}
-        main()
-        self.assert_set_env_file_called_with(
-            HOST_MOUNT='production', HOST_MOUNT_SOURCE='data_olympia_'
-        )
-
-
 @override_env()
 class TestOlympiaDeps(BaseTestClass):
     def test_default_olympia_deps(self):