diff --git a/docker-compose.yml b/docker-compose.yml
index 0a90263b0..60c9a211a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,5 +29,7 @@ services:
     volumes:
       - ./frontend/:/home/node/
     command: "yarn serve"
+    environment:
+      DOCKER: "yes"
     depends_on:
       - api
diff --git a/frontend/vue.config.js b/frontend/vue.config.js
index cd62da792..3ceebaec0 100644
--- a/frontend/vue.config.js
+++ b/frontend/vue.config.js
@@ -2,7 +2,10 @@ module.exports = {
   devServer: {
     proxy: {
       "/api": {
-        target: "http://localhost:8000/",
+        target:
+          process.env.DOCKER == "yes"
+            ? "http://api:8000/"
+            : "http://localhost:8000",
       },
     },
   },
diff --git a/test_project/test_project/settings.py b/test_project/test_project/settings.py
index f0d1b63de..7a3b82a74 100644
--- a/test_project/test_project/settings.py
+++ b/test_project/test_project/settings.py
@@ -28,6 +28,7 @@ SECRET_KEY = '!8o(-dbbl3e+*bh7nx-^xysdt)1gso*%@4ze4-9_9o+i&t--u_'
 DEBUG = 'DEBUG' in os.environ
 
 ALLOWED_HOSTS = [
+    'api',
     '127.0.0.1',
     'localhost',
 ]