diff --git a/build_and_inspect_tester b/build_and_inspect_tester
index b7d8a8c..4d28cc9 100755
--- a/build_and_inspect_tester
+++ b/build_and_inspect_tester
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-docker build --tag="uphold-tester:dockerfile" --file="Dockerfile.tester" .
+docker build --tag="uphold-tester:dockerfile" --file="dockerfiles/tester/Dockerfile" .
 docker run \
   -it \
    --entrypoint=/bin/bash \
diff --git a/build_and_inspect_ui b/build_and_inspect_ui
index fedd4ea..53b242b 100755
--- a/build_and_inspect_ui
+++ b/build_and_inspect_ui
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-docker build --tag="uphold-ui:dockerfile" --file="Dockerfile.ui" .
+docker build --tag="uphold-ui:dockerfile" --file="dockerfiles/ui/Dockerfile" .
 docker run \
   -it \
    --entrypoint=/bin/bash \
diff --git a/build_and_run_tester b/build_and_run_tester
index 62ee957..c575fc9 100755
--- a/build_and_run_tester
+++ b/build_and_run_tester
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-docker build --tag="uphold-tester:dockerfile" --file=Dockerfile.tester .
+docker build --tag="uphold-tester:dockerfile" --file="dockerfiles/tester/Dockerfile" .
 docker run \
   -it \
   -v /var/run/docker.sock:/var/run/docker.sock \
diff --git a/build_and_run_ui b/build_and_run_ui
index 2adcc1d..e194670 100755
--- a/build_and_run_ui
+++ b/build_and_run_ui
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-docker build --tag="uphold-tester:dockerfile" --file=Dockerfile.tester .
-docker build --tag="uphold-ui:dockerfile" --file=Dockerfile.ui .
+docker build --tag="uphold-tester:dockerfile" --file="dockerfiles/tester/Dockerfile" .
+docker build --tag="uphold-ui:dockerfile" --file="dockerfiles/ui/Dockerfile" .
 
 docker run \
   -it \
diff --git a/Dockerfile.tester b/dockerfiles/tester/Dockerfile
similarity index 100%
rename from Dockerfile.tester
rename to dockerfiles/tester/Dockerfile
diff --git a/Dockerfile.ui b/dockerfiles/ui/Dockerfile
similarity index 100%
rename from Dockerfile.ui
rename to dockerfiles/ui/Dockerfile