diff --git a/.github/workflows/publish-pg_tracing-pgxn.yml b/.github/workflows/publish-pg_tracing-pgxn.yml
index 6dd7745..bcdad73 100644
--- a/.github/workflows/publish-pg_tracing-pgxn.yml
+++ b/.github/workflows/publish-pg_tracing-pgxn.yml
@@ -25,7 +25,7 @@ jobs:
 
       - id: dist
         name: Bundle the Release
-        run: make dist >> "$GITHUB_OUTPUT"
+        run: make -s dist >> "$GITHUB_OUTPUT"
 
       - name: Release on PGXN
         env:
diff --git a/Dockerfile b/Dockerfile
index 17b5095..2c41fd3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,6 +44,8 @@ RUN mkdir src
 # Copy sources and compile
 COPY --chown=postgres common.mk ./
 COPY --chown=postgres Makefile ./
+COPY --chown=postgres Makefile.dist ./
+COPY --chown=postgres META.json.in ./
 COPY --chown=postgres typedefs.list ./
 COPY --chown=postgres *.sql ./
 COPY --chown=postgres pg_tracing.control ./
diff --git a/Makefile b/Makefile
index 35e0f33..51a1386 100644
--- a/Makefile
+++ b/Makefile
@@ -77,7 +77,7 @@ pgindent: typedefs.list
 	pgindent --typedefs=typedefs.list src/*.c src/*.h
 
 # DOCKER BUILDS
-TEST_CONTAINER_NAME	= pg_tracing_test_$(PG_VERSION)
+TEST_CONTAINER_NAME	= pg_tracing_test
 BUILD_TEST_TARGETS	= $(patsubst %,build-test-pg%,$(PG_VERSIONS))
 DOCKER_RUN_OPTS		= --rm --name $(TEST_CONTAINER_NAME) $(TEST_CONTAINER_NAME):pg$(PG_VERSION)
 
diff --git a/packages/deb.Dockerfile b/packages/deb.Dockerfile
index 8096654..6a6b9b1 100644
--- a/packages/deb.Dockerfile
+++ b/packages/deb.Dockerfile
@@ -34,6 +34,8 @@ RUN mkdir src
 # Copy sources and compile
 COPY --chown=postgres common.mk ./
 COPY --chown=postgres Makefile ./
+COPY --chown=postgres Makefile.dist ./
+COPY --chown=postgres META.json.in ./
 COPY --chown=postgres *.sql ./
 COPY --chown=postgres pg_tracing.control ./
 COPY --chown=postgres ./src/*.c ./src