diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 0540941..f2b332c 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -81,6 +81,12 @@ jobs:
             git remote remove app
           )
           echo '::endgroup::'
+          echo '::group::Reset Git repository index in app source code directory'
+          (
+            cd app &&
+            git reset
+          )
+          echo '::endgroup::'
 
       - name: Pull dependencies
         run: |
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 5b3248f..1ad52df 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -114,6 +114,12 @@ jobs:
             git remote remove app
           )
           echo '::endgroup::'
+          echo '::group::Reset Git repository index in app source code directory'
+          (
+            cd app &&
+            git reset
+          )
+          echo '::endgroup::'
 
       - name: Pull dependencies
         run: |
diff --git a/app/.starlight-template b/app/.starlight-template
index 26bf141..8ace09f 100644
--- a/app/.starlight-template
+++ b/app/.starlight-template
@@ -1 +1 @@
-283d120bcb9b1fe4d77b9cbb780dcaa968d44c76
+695c1e2d6b7e375ca790f77df91944129f5fde67
diff --git a/app/Dockerfile b/app/Dockerfile
index 5c6161d..b895a28 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -139,9 +139,9 @@ ARG UID
 
 # Set runtime environment
 ENV APP_ENV=test
+ENV NODE_ENV=development
 
 # Copy dev dependencies
-ENV NODE_ENV=development
 COPY --from=deps_dev --link --chown="${UID}:0" /app/.astro/ ./.astro/
 COPY --from=deps_dev --link --chown="${UID}:0" /app/node_modules/ ./node_modules/
 
@@ -200,9 +200,9 @@ ARG UID
 
 # Set runtime environment
 ENV APP_ENV=dev
+ENV NODE_ENV=development
 
 # Copy dev dependencies
-ENV NODE_ENV=development
 COPY --from=deps_dev --link --chown="${UID}:0" /app/.astro/ ./.astro/
 COPY --from=deps_dev --link --chown="${UID}:0" /app/node_modules/ ./node_modules/
 
@@ -241,14 +241,15 @@ ARG UID
 
 # Set runtime environment
 ENV APP_ENV=prod
+ENV NODE_ENV=production
 
-# Install git, used to fetch history during build
+# Install & configure git, used to fetch history during build
 RUN --mount=type=cache,target=/var/cache/apt \
 	apt-get update && \
-	apt-get install -y git
+	apt-get install -y git && \
+	git config --global --add safe.directory /app
 
 # Copy dev dependencies
-ENV NODE_ENV=development
 COPY --from=deps_dev --link --chown="${UID}:0" /app/node_modules/ ./node_modules/
 
 # Copy source code