diff --git a/.github/workflows/chain-spec-snapshot-build.yml b/.github/workflows/chain-spec-snapshot-build.yml
index d1072428e0c..343839e1fbf 100644
--- a/.github/workflows/chain-spec-snapshot-build.yml
+++ b/.github/workflows/chain-spec-snapshot-build.yml
@@ -23,7 +23,7 @@ jobs:
         id: build
         uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
         with:
-          file: Dockerfile-node
+          file: docker/node.Dockerfile
           push: false
 
       - name: Generate testnet chain specifications
diff --git a/.github/workflows/domain-genesis-storage-snapshot-build.yml b/.github/workflows/domain-genesis-storage-snapshot-build.yml
index 8fe76b8c52c..ba057176ada 100644
--- a/.github/workflows/domain-genesis-storage-snapshot-build.yml
+++ b/.github/workflows/domain-genesis-storage-snapshot-build.yml
@@ -22,7 +22,7 @@ jobs:
         id: build
         uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
         with:
-          file: Dockerfile-node
+          file: docker/node.Dockerfile
           push: false
 
       - name: Generate testnet domain genesis storages
diff --git a/.github/workflows/runtime-snapshot-build.yml b/.github/workflows/runtime-snapshot-build.yml
index 55acd01882e..e042695a23d 100644
--- a/.github/workflows/runtime-snapshot-build.yml
+++ b/.github/workflows/runtime-snapshot-build.yml
@@ -26,7 +26,7 @@ jobs:
         id: build
         uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
         with:
-          file: Dockerfile-runtime
+          file: docker/runtime.Dockerfile
           push: false
 
       - name: Extract runtime
diff --git a/.github/workflows/snapshot-build.yml b/.github/workflows/snapshot-build.yml
index a0460ab36c8..e61f6db6353 100644
--- a/.github/workflows/snapshot-build.yml
+++ b/.github/workflows/snapshot-build.yml
@@ -61,7 +61,7 @@ jobs:
       - name: Build and push ${{ matrix.image }} image
         uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
         with:
-          file: Dockerfile-${{ matrix.image }}
+          file: docker/${{ matrix.image }}.Dockerfile
           # TODO: Add `linux/riscv64` once https://github.com/paritytech/polkadot-sdk/issues/5996 is resolved and ring
           #  0.16.x is no longer in dependencies
           platforms: linux/amd64,linux/arm64
diff --git a/.dockerignore b/docker/.dockerignore
similarity index 100%
rename from .dockerignore
rename to docker/.dockerignore
diff --git a/Dockerfile-bootstrap-node b/docker/bootstrap-node.Dockerfile
similarity index 100%
rename from Dockerfile-bootstrap-node
rename to docker/bootstrap-node.Dockerfile
diff --git a/docker/bootstrap-node.Dockerfile.dockerignore b/docker/bootstrap-node.Dockerfile.dockerignore
new file mode 100644
index 00000000000..983f1aefffc
--- /dev/null
+++ b/docker/bootstrap-node.Dockerfile.dockerignore
@@ -0,0 +1,9 @@
+*
+!/crates
+!/domains
+!/orml
+!/shared
+!/test
+!/Cargo.lock
+!/Cargo.toml
+!/rust-toolchain.toml
diff --git a/Dockerfile-farmer b/docker/farmer.Dockerfile
similarity index 100%
rename from Dockerfile-farmer
rename to docker/farmer.Dockerfile
diff --git a/docker/farmer.Dockerfile.dockerignore b/docker/farmer.Dockerfile.dockerignore
new file mode 100644
index 00000000000..983f1aefffc
--- /dev/null
+++ b/docker/farmer.Dockerfile.dockerignore
@@ -0,0 +1,9 @@
+*
+!/crates
+!/domains
+!/orml
+!/shared
+!/test
+!/Cargo.lock
+!/Cargo.toml
+!/rust-toolchain.toml
diff --git a/Dockerfile-node b/docker/node.Dockerfile
similarity index 100%
rename from Dockerfile-node
rename to docker/node.Dockerfile
diff --git a/docker/node.Dockerfile.dockerignore b/docker/node.Dockerfile.dockerignore
new file mode 100644
index 00000000000..983f1aefffc
--- /dev/null
+++ b/docker/node.Dockerfile.dockerignore
@@ -0,0 +1,9 @@
+*
+!/crates
+!/domains
+!/orml
+!/shared
+!/test
+!/Cargo.lock
+!/Cargo.toml
+!/rust-toolchain.toml
diff --git a/Dockerfile-runtime b/docker/runtime.Dockerfile
similarity index 100%
rename from Dockerfile-runtime
rename to docker/runtime.Dockerfile
diff --git a/docker/runtime.Dockerfile.dockerignore b/docker/runtime.Dockerfile.dockerignore
new file mode 100644
index 00000000000..983f1aefffc
--- /dev/null
+++ b/docker/runtime.Dockerfile.dockerignore
@@ -0,0 +1,9 @@
+*
+!/crates
+!/domains
+!/orml
+!/shared
+!/test
+!/Cargo.lock
+!/Cargo.toml
+!/rust-toolchain.toml