diff --git a/.dockerignore b/.dockerignore
index c7a2f78e32..3c4a748cf7 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -13,6 +13,7 @@
 # Directories
 !.cargo/
 !.config/
+!compute/
 !compute_tools/
 !control_plane/
 !libs/
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index f36dbfb1f0..a634edb96b 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -651,7 +651,7 @@ jobs:
           provenance: false
           push: true
           pull: true
-          file: Dockerfile.compute-node
+          file: compute/Dockerfile.compute-node
           cache-from: type=registry,ref=cache.neon.build/compute-node-${{ matrix.version }}:cache-${{ matrix.arch }}
           cache-to: ${{ github.ref_name == 'main' && format('type=registry,ref=cache.neon.build/compute-node-{0}:cache-{1},mode=max', matrix.version, matrix.arch) || '' }}
           tags: |
@@ -670,7 +670,7 @@ jobs:
           provenance: false
           push: true
           pull: true
-          file: Dockerfile.compute-node
+          file: compute/Dockerfile.compute-node
           target: neon-pg-ext-test
           cache-from: type=registry,ref=cache.neon.build/neon-test-extensions-${{ matrix.version }}:cache-${{ matrix.arch }}
           cache-to: ${{ github.ref_name == 'main' && format('type=registry,ref=cache.neon.build/neon-test-extensions-{0}:cache-{1},mode=max', matrix.version, matrix.arch) || '' }}
@@ -691,7 +691,7 @@ jobs:
           provenance: false
           push: true
           pull: true
-          file: Dockerfile.compute-node
+          file: compute/Dockerfile.compute-node
           tags: |
             neondatabase/compute-tools:${{ needs.tag.outputs.build-tag }}-${{ matrix.arch }}
 
@@ -779,7 +779,7 @@ jobs:
       - name: Build vm image
         run: |
           ./vm-builder \
-            -spec=vm-image-spec.yaml \
+            -spec=compute/vm-image-spec.yaml \
             -src=neondatabase/compute-node-${{ matrix.version }}:${{ needs.tag.outputs.build-tag }} \
             -dst=neondatabase/vm-compute-node-${{ matrix.version }}:${{ needs.tag.outputs.build-tag }}
 
diff --git a/.github/workflows/trigger-e2e-tests.yml b/.github/workflows/trigger-e2e-tests.yml
index b299cf9b99..f25c1051cd 100644
--- a/.github/workflows/trigger-e2e-tests.yml
+++ b/.github/workflows/trigger-e2e-tests.yml
@@ -107,7 +107,7 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" == "pull_request" ]; then
             for f in $(gh api "/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/files" --paginate --jq '.[].filename'); do
               case "$f" in
-                vendor/*|pgxn/*|libs/vm_monitor/*|Dockerfile.compute-node)
+                vendor/*|pgxn/*|libs/vm_monitor/*|compute/Dockerfile.compute-node)
                   platforms=$(echo "${platforms}" | jq --compact-output '. += ["k8s-neonvm"] | unique')
                   ;;
                 *)
diff --git a/Dockerfile.compute-node b/compute/Dockerfile.compute-node
similarity index 100%
rename from Dockerfile.compute-node
rename to compute/Dockerfile.compute-node
diff --git a/compute/README.md b/compute/README.md
new file mode 100644
index 0000000000..981d290fc0
--- /dev/null
+++ b/compute/README.md
@@ -0,0 +1,18 @@
+This directory contains files that are needed to build the compute
+images, or included in the compute images.
+
+Dockerfile.compute-node
+	To build the compute image
+
+vm-image-spec.yaml
+	Instructions for vm-builder, to turn the compute-node image into
+	corresponding vm-compute-node image.
+
+patches/
+	Some extensions need to be patched to work with Neon. This
+	directory contains such patches. They are applied to the extension
+	sources in Dockerfile.compute-node
+
+In addition to these, postgres itself, the neon postgres extension,
+and compute_ctl are built and copied into the compute image by
+Dockerfile.compute-node.
diff --git a/patches/pg_anon.patch b/compute/patches/pg_anon.patch
similarity index 100%
rename from patches/pg_anon.patch
rename to compute/patches/pg_anon.patch
diff --git a/patches/pg_cron.patch b/compute/patches/pg_cron.patch
similarity index 100%
rename from patches/pg_cron.patch
rename to compute/patches/pg_cron.patch
diff --git a/patches/pg_hint_plan.patch b/compute/patches/pg_hint_plan.patch
similarity index 100%
rename from patches/pg_hint_plan.patch
rename to compute/patches/pg_hint_plan.patch
diff --git a/patches/pgvector.patch b/compute/patches/pgvector.patch
similarity index 100%
rename from patches/pgvector.patch
rename to compute/patches/pgvector.patch
diff --git a/patches/rum.patch b/compute/patches/rum.patch
similarity index 100%
rename from patches/rum.patch
rename to compute/patches/rum.patch
diff --git a/vm-image-spec.yaml b/compute/vm-image-spec.yaml
similarity index 100%
rename from vm-image-spec.yaml
rename to compute/vm-image-spec.yaml