diff --git a/Dockerfile.listers b/Dockerfile.listers
index beda00f..05ae182 100644
--- a/Dockerfile.listers
+++ b/Dockerfile.listers
@@ -1,8 +1,6 @@
 ARG BASE
 
 FROM $BASE
 
-COPY swh-scheduler /app/swh-scheduler
-RUN pip install /app/swh-scheduler
 COPY swh-lister /app/swh-lister
 RUN pip install /app/swh-lister
diff --git a/Dockerfile.loaders b/Dockerfile.loaders
index 173ac7e..71ef078 100644
--- a/Dockerfile.loaders
+++ b/Dockerfile.loaders
@@ -1,12 +1,8 @@
 ARG BASE
 
 FROM $BASE
 
-COPY swh-scheduler /app/swh-scheduler
 COPY swh-loader-core /app/swh-loader-core
+RUN pip install /app/swh-loader-core
 COPY swh-loader-git /app/swh-loader-git
-# COPY swh-loader-svn /app/swh/swh-loader-svn
-# COPY swh-loader-mercurial /app/swh/swh-loader-mercurial
-
-RUN pip install /app/swh-scheduler && pip install /app/swh-loader-core && pip install /app/swh-loader-git
-#    pip install /app/swh-loader-svn && pip install /app/swh-loader-mercurial
+RUN pip install /app/swh-loader-git
diff --git a/Dockerfile.storage b/Dockerfile.storage
index a53caa1..60a164c 100644
--- a/Dockerfile.storage
+++ b/Dockerfile.storage
@@ -1,14 +1,6 @@
 ARG BASE
 
 FROM $BASE
 
-# COPY swh-storage/requirements.txt /app/requirements-storage.txt
-# COPY swh-objstorage/requirements.txt /app/requirements-obstorage.txt
-
-# COPY swh-objstorage/swh /app/swh
-# COPY swh-storage/swh /app/swh
-
-COPY swh-objstorage /app/swh-objstorage
 COPY swh-storage /app/swh-storage
-
-RUN pip install /app/swh-objstorage && pip install /app/swh-storage
+RUN pip install /app/swh-storage
diff --git a/Dockerfile.webapp b/Dockerfile.webapp
index 6d128a3..42bcc93 100644
--- a/Dockerfile.webapp
+++ b/Dockerfile.webapp
@@ -1,18 +1,6 @@
 ARG BASE
 
 FROM $BASE
 
-COPY swh-auth /app/swh-auth
-RUN pip install /app/swh-auth
-COPY swh-vault /app/swh-vault
-RUN pip install /app/swh-vault
-COPY swh-indexer /app/swh-indexer
-RUN pip install /app/swh-indexer
-COPY swh-scheduler /app/swh-scheduler
-RUN pip install /app/swh-scheduler
-COPY swh-search /app/swh-search
-RUN pip install /app/swh-search
-COPY swh-storage /app/swh-storage
-RUN pip install /app/swh-storage
 COPY swh-web /app/swh-web
 RUN pip install /app/swh-web
diff --git a/skaffold.yaml b/skaffold.yaml
index e208d66..f84c1e7 100644
--- a/skaffold.yaml
+++ b/skaffold.yaml
@@ -1,84 +1,85 @@
 apiVersion: skaffold/v2beta13
 kind: Config
 metadata:
   name: swh-environment
 build:
   artifacts:
   - image: swh/stack-base
+    context: docker
     docker:
       dockerfile: Dockerfile
   - image: swh/objstorage
     docker:
       dockerfile: Dockerfile.objstorage
     requires:
       - image: swh/stack-base
         alias: BASE
   - image: swh/storage
     docker:
       dockerfile: Dockerfile.storage
     requires:
       - image: swh/stack-base
         alias: BASE
   - image: swh/scheduler
     docker:
       dockerfile: Dockerfile.scheduler
     requires:
       - image: swh/stack-base
         alias: BASE
   - image: swh/webapp
     docker:
       dockerfile: Dockerfile.webapp
     requires:
       - image: swh/stack-base
         alias: BASE
   - image: swh/loaders
     docker:
       dockerfile: Dockerfile.loaders
     requires:
       - image: swh/stack-base
         alias: BASE
   - image: swh/listers
     docker:
       dockerfile: Dockerfile.listers
     requires:
       - image: swh/stack-base
         alias: BASE
   - image: swh/grafana
     docker:
       dockerfile: Dockerfile.grafana
   - image: swh/search
     docker:
       dockerfile: Dockerfile.search
     requires:
       - image: swh/stack-base
         alias: BASE
   - image: swh/counters
     docker:
       dockerfile: Dockerfile.counters
     requires:
       - image: swh/stack-base
         alias: BASE
 deploy:
   kubectl:
     manifests:
     - kubernetes/01-journal.yml
     - kubernetes/02-monitoring.yml
     - kubernetes/05-storage-db.yml
     - kubernetes/10-objstorage.yml
     - kubernetes/11-storage.yml
     - kubernetes/15-scheduler-db.yml
     - kubernetes/16-rabbitmq.yml
     - kubernetes/20-scheduler.yml
     - kubernetes/21-scheduler-runner.yml
     - kubernetes/22-scheduler-listener.yml
     - kubernetes/23-scheduler-journal-client.yml
     - kubernetes/29-web-db.yml
     - kubernetes/30-webapp.yml
     - kubernetes/40-loaders.yml
     - kubernetes/45-listers.yml
     - kubernetes/50-elasticsearch.yml
     - kubernetes/55-search.yml
     - kubernetes/56-search-journal-client.yml
     - kubernetes/60-redis.yml
     - kubernetes/61-counters.yml
     - kubernetes/62-counters-journal-client.yml