diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 53125c2617..b9e626f478 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -216,11 +216,11 @@ jobs:
     - name: Git stuff
       # As of go 1.20, this seems to be necessary for invoking git commands
       # within the container
-      run: git config --global --add safe.directory /__w/kargo/kargo
+      run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
     - name: Run Codegen
       run: make codegen
     - name: Check nothing has changed
-      run: git diff --exit-code -- .
+      run: git -C "$GITHUB_WORKSPACE" diff --exit-code -- .
 
   build-image:
     needs: [test-unit, lint-go, lint-charts, lint-proto, lint-and-typecheck-ui, check-codegen]
diff --git a/Dockerfile b/Dockerfile
index f67514b943..8304a9d36f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,6 +37,7 @@ RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache
 COPY api/ api/
 COPY pkg/ pkg/
 COPY cmd/ cmd/
+COPY extended/ extended/
 COPY --from=ui-builder /ui/build pkg/server/ui/
 
 ARG VERSION
diff --git a/extended/docs/UPSTREAM_KARGO_MERGE_PROCEDURE.md b/extended/docs/UPSTREAM_KARGO_MERGE_PROCEDURE.md
index b80326618b..3648fb16ae 100644
--- a/extended/docs/UPSTREAM_KARGO_MERGE_PROCEDURE.md
+++ b/extended/docs/UPSTREAM_KARGO_MERGE_PROCEDURE.md
@@ -11,6 +11,7 @@ upstream-kargo-merge/YYYY-MM-DD
 
 Report path:
 
+
 ```text
 extended/docs/upstream-kargo-merge-reports/YYYY-MM-DD.yaml
 ```