diff --git a/docker-compose.yml b/docker-compose.yml
index 18c544dec..0bf590fea 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,20 +6,20 @@ services:
     container_name: backend
     build:
       context: ./
-      dockerfile: ./functions/emulator/Dockerfile
+      dockerfile: ./emulator/Dockerfile
     depends_on:
       simulated-webhook-receiver:
         condition: service_healthy
     ports:
     - 4001-4008:4001-4008
     volumes:
+    - ./emulator/logs:/app/logs
     - ./functions:/app/functions
     - ./functions/data/emulator:/seed
-    - ./functions/logs:/app/logs
     - ./functions/src/emailNotifications/templates:/templates
 
   simulated-webhook-receiver:
     container_name: simulated-webhook-receiver
     build:
-      context: ./packages/simulated-webhook-receiver/
+      context: ./packages/simulated-webhook-receiver
       dockerfile: Dockerfile
diff --git a/functions/emulator/Dockerfile b/emulator/Dockerfile
similarity index 95%
rename from functions/emulator/Dockerfile
rename to emulator/Dockerfile
index a73f35f57..5a991b801 100644
--- a/functions/emulator/Dockerfile
+++ b/emulator/Dockerfile
@@ -15,7 +15,7 @@
 # therefore these commands should be ran from there.
 #
 #   BUILD
-#   docker build -f ./functions/emulator/Dockerfile -t emulator .
+#   docker build -f ./emulator/Dockerfile -t emulator .
 #
 #   RUN
 #   docker run -v ./functions:/app/functions -p 4001-4008:4001-4008 -it emulator
@@ -86,9 +86,9 @@ COPY ./firebase.storage.rules           ./firebase.storage.rules
 COPY ./firestore.indexes.json           ./firestore.indexes.json
 COPY ./firestore.rules                  ./firestore.rules
 
-COPY ./functions/emulator/export.js     ./export.js
+COPY ./emulator/export.js               ./export.js
 
-COPY ./functions/emulator/link-logs.js  ./link-logs.js
+COPY ./emulator/link-logs.js            ./link-logs.js
 
 # This folder needs to exist because otherwise
 # the emulators error if the user did not mount
diff --git a/functions/emulator/export.js b/emulator/export.js
similarity index 100%
rename from functions/emulator/export.js
rename to emulator/export.js
diff --git a/functions/emulator/link-logs.js b/emulator/link-logs.js
similarity index 100%
rename from functions/emulator/link-logs.js
rename to emulator/link-logs.js
diff --git a/functions/logs/.gitignore b/emulator/logs/.gitignore
similarity index 100%
rename from functions/logs/.gitignore
rename to emulator/logs/.gitignore
diff --git a/functions/logs/.gitkeep b/emulator/logs/.gitkeep
similarity index 100%
rename from functions/logs/.gitkeep
rename to emulator/logs/.gitkeep