diff --git a/Dockerfile-dev b/Dockerfile-dev
index a07221044fc67..8051be45a1556 100644
--- a/Dockerfile-dev
+++ b/Dockerfile-dev
@@ -21,10 +21,12 @@
 FROM preset/superset:dev
 
 COPY ./requirements/*.txt ./docker/requirements-*.txt /app/requirements/
+COPY ./setup.py ./MANIFEST.in /app/
 
 USER root
 # Cache everything for dev purposes...
 RUN cd /app \
-    && pip install --no-cache -r requirements/docker.txt \
-    && pip install --no-cache -r requirements/requirements-local.txt || true
+    && pip install -e . \
+    && pip install -r requirements/docker.txt \
+    && pip install -r requirements/requirements-local.txt || true
 USER superset
diff --git a/docker-compose.yml b/docker-compose.yml
index ed8c2db9bb153..b01789ce066bc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -71,9 +71,9 @@ services:
     volumes: *superset-volumes
 
   superset-node:
-    image: node:10-jessie
+    image: node:12
     container_name: superset_node
-    command: ["bash", "-c", "cd /app/superset-frontend && npm install --global webpack webpack-cli && npm install && npm run dev"]
+    command: ["bash", "-c", "cd /app/superset-frontend && npm install -f --no-optional --global webpack webpack-cli && npm install -f --no-optional && npm run dev"]
     env_file: docker/.env
     depends_on: *superset-depends-on
     volumes: *superset-volumes