diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index cd4906579e..cf797cc3c0 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -960,7 +960,7 @@ jobs:
 
           # In compute image we have a bit different directory layout
           mkdir -p extensions-to-upload/share
-          docker cp ${{ steps.create-container.outputs.CID }}:/usr/local/share/extension ./extensions-to-upload/share/extension
+          docker cp ${{ steps.create-container.outputs.CID }}:/usr/local/share/extension/*.zip ./extensions-to-upload/share/extension
           docker cp ${{ steps.create-container.outputs.CID }}:/usr/local/lib             ./extensions-to-upload/lib
 
           # Delete Neon extensitons (they always present on compute-node image)
diff --git a/Dockerfile.compute-node b/Dockerfile.compute-node
index 7208024d63..0d22199afb 100644
--- a/Dockerfile.compute-node
+++ b/Dockerfile.compute-node
@@ -753,7 +753,7 @@ FROM scratch AS postgres-extensions
 # COPY --from=postgres-cleanup-layer /usr/local/pgsql/lib             /usr/local/pgsql/lib
 # Custom extensions
 COPY --from=pg-anon-pg-build /extensions/anon/lib/ /extensions/anon/lib
-COPY --from=pg-anon-pg-build /extensions/anon/share/extension /extensions/anon/share/extension
+RUN --from=pg-anon-pg-build zip /extensions/anon/share/extension /extensions/anon/share/extension/anon.zip
 
 #########################################################################################
 #