diff --git a/.github/workflows/guardiand-docker.yml b/.github/workflows/guardiand-docker.yml
index 61bd21276..a46eac6c3 100644
--- a/.github/workflows/guardiand-docker.yml
+++ b/.github/workflows/guardiand-docker.yml
@@ -43,7 +43,7 @@ jobs:
         uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
         with:
           context: .
-          file: ./Dockerfile.node
+          file: ./node/Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           target: export
diff --git a/Tiltfile b/Tiltfile
index 051b466c5..63b4a7b5b 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -114,7 +114,7 @@ if bigTableKeyPath != "":
 docker_build(
     ref = "guardiand-image",
     context = ".",
-    dockerfile = "Dockerfile.node",
+    dockerfile = "node/Dockerfile",
     target = "build",
     ignore=["./sdk/js"]
 )
@@ -371,7 +371,7 @@ if solana:
         ref = "bridge-client",
         context = ".",
         only = ["./proto", "./solana", "./clients"],
-        dockerfile = "Dockerfile.client",
+        dockerfile = "solana/Dockerfile.client",
         # Ignore target folders from local (non-container) development.
         ignore = ["./solana/*/target"],
     )
@@ -600,7 +600,7 @@ if terra2:
     docker_build(
         ref = "terra2-contracts",
         context = ".",
-        dockerfile = "./Dockerfile.cosmwasm",
+        dockerfile = "./cosmwasm/Dockerfile",
     )
 
     k8s_yaml_with_ns("devnet/terra2-devnet.yaml")
@@ -720,7 +720,7 @@ if wormchain:
     docker_build(
         ref = "wormchaind-image",
         context = ".",
-        dockerfile = "./Dockerfile.wormchain",
+        dockerfile = "./wormchain/Dockerfile",
         only = [],
         ignore = ["./wormchain/testing", "./wormchain/ts-sdk", "./wormchain/design", "./wormchain/vue", "./wormchain/build/wormchaind"],
     )
diff --git a/Dockerfile.cosmwasm b/cosmwasm/Dockerfile
similarity index 100%
rename from Dockerfile.cosmwasm
rename to cosmwasm/Dockerfile
diff --git a/cosmwasm/Makefile b/cosmwasm/Makefile
index 8aa944eda..f717bcbfa 100644
--- a/cosmwasm/Makefile
+++ b/cosmwasm/Makefile
@@ -22,7 +22,7 @@ ifndef VALID_$(NETWORK)
 endif
 
 $(WASMS) artifacts/checksums.txt: $(SOURCE_FILES)
-	DOCKER_BUILDKIT=1 docker build --target artifacts -o artifacts -f ../Dockerfile.cosmwasm ../
+	DOCKER_BUILDKIT=1 docker build --target artifacts -o artifacts -f ./Dockerfile ../
 
 payer-$(NETWORK).json:
 	$(error Missing private key in payer-$(NETWORK).json)
diff --git a/Dockerfile.node b/node/Dockerfile
similarity index 100%
rename from Dockerfile.node
rename to node/Dockerfile
diff --git a/Dockerfile.lint b/scripts/Dockerfile.lint
similarity index 100%
rename from Dockerfile.lint
rename to scripts/Dockerfile.lint
diff --git a/scripts/lint.sh b/scripts/lint.sh
index dd43c1600..ebdeb2719 100755
--- a/scripts/lint.sh
+++ b/scripts/lint.sh
@@ -4,7 +4,7 @@
 set -eo pipefail -o nounset
 
 ROOT="$(dirname "$(dirname "$(realpath "$0")")")"
-DOCKERFILE="$ROOT/Dockerfile.lint"
+DOCKERFILE="$ROOT/scripts/Dockerfile.lint"
 
 VALID_COMMANDS=("lint" "format")
 
diff --git a/Dockerfile.client b/solana/Dockerfile.client
similarity index 100%
rename from Dockerfile.client
rename to solana/Dockerfile.client
diff --git a/Dockerfile.wormchain b/wormchain/Dockerfile
similarity index 100%
rename from Dockerfile.wormchain
rename to wormchain/Dockerfile