diff --git a/templates/extractorapp/extractorapp-deployment.yaml b/templates/extractorapp/extractorapp-deployment.yaml
deleted file mode 100644
index 49be033..0000000
--- a/templates/extractorapp/extractorapp-deployment.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-{{- $webapp := .Values.georchestra.webapps.extractorapp -}}
-{{- if $webapp.enabled -}}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "georchestra.fullname" . }}-extractorapp
-  labels:
-    {{- include "georchestra.labels" . | nindent 4 }}
-    app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-extractorapp
-spec:
-  replicas: {{ $webapp.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "georchestra.selectorLabels" . | nindent 6 }}
-      app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-extractorapp
-  template:
-    metadata:
-      labels:
-        {{- include "georchestra.selectorLabels" . | nindent 8 }}
-        org.georchestra.service/name: {{ include "georchestra.fullname" . }}-extractorapp
-        app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-extractorapp
-    spec:
-      nodeSelector:
-        "kubernetes.io/os": linux
-        {{- with .Values.georchestra.nodeSelector }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-      initContainers:
-      {{ include "georchestra.bootstrap_georchestra_datadir" . | nindent 6 }}
-      containers:
-      - name: georchestra-extractorapp
-        image: {{ $webapp.docker_image }}
-        imagePullPolicy: Always
-        env:
-          {{- include "georchestra.common-envs" . | nindent 10 }}
-          {{- include "georchestra.database-georchestra-envs" . | nindent 10 }}
-          {{- if $webapp.extra_environment }}
-          {{- $webapp.extra_environment | toYaml | nindent 10 }}
-          {{- end }}
-        volumeMounts:
-          - mountPath: /etc/georchestra
-            name: georchestra-datadir
-        ports:
-        - containerPort: 8080
-          name: http-proxy
-        livenessProbe:
-          httpGet:
-            path: /extractorapp/extractor/tasks
-            port: 8080
-          periodSeconds: 10
-        startupProbe:
-          tcpSocket:
-            port: 8080
-          failureThreshold: 5
-          periodSeconds: 20
-      volumes:
-      - name: georchestra-datadir
-        emptyDir: {}
-      {{- if .Values.georchestra.datadir.git.ssh_secret }}
-      - name: ssh-secret
-        secret:
-          secretName: {{ .Values.georchestra.datadir.git.ssh_secret }}
-          defaultMode: 0400
-      {{- end }}
-      {{- if $webapp.registry_secret }}
-      imagePullSecrets:
-      - name: {{ $webapp.registry_secret }}
-      {{- end }}
-{{- end }}
-
diff --git a/templates/extractorapp/extractorapp-svc.yaml b/templates/extractorapp/extractorapp-svc.yaml
deleted file mode 100644
index 5274f62..0000000
--- a/templates/extractorapp/extractorapp-svc.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-{{- $webapp := .Values.georchestra.webapps.extractorapp -}}
-{{- if $webapp.enabled -}}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "georchestra.fullname" . }}-extractorapp-svc
-  labels:
-    {{- include "georchestra.labels" . | nindent 4 }}
-    app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-extractorapp
-  {{- with $webapp.service.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  ports:
-  - port: 8080
-    protocol: TCP
-    targetPort: 8080
-  selector:
-    org.georchestra.service/name: {{ include "georchestra.fullname" . }}-extractorapp
-{{- end }}
\ No newline at end of file
diff --git a/templates/mapfishapp/mapfishapp-deployment.yaml b/templates/mapfishapp/mapfishapp-deployment.yaml
deleted file mode 100644
index bc63f28..0000000
--- a/templates/mapfishapp/mapfishapp-deployment.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-{{- $webapp := .Values.georchestra.webapps.mapfishapp -}}
-{{- if $webapp.enabled -}}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "georchestra.fullname" . }}-mapfishapp
-  labels:
-    {{- include "georchestra.labels" . | nindent 4 }}
-    app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-mapfishapp
-spec:
-  replicas: {{ $webapp.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "georchestra.selectorLabels" . | nindent 6 }}
-      app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-mapfishapp
-  template:
-    metadata:
-      labels:
-        {{- include "georchestra.selectorLabels" . | nindent 8 }}
-        org.georchestra.service/name: {{ include "georchestra.fullname" . }}-mapfishapp
-        app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-mapfishapp
-    spec:
-      nodeSelector:
-        "kubernetes.io/os": linux
-        {{- with .Values.georchestra.nodeSelector }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-      initContainers:
-      {{ include "georchestra.bootstrap_georchestra_datadir" . | nindent 6 }}
-      containers:
-      - name: georchestra-mapfishapp
-        image: {{ $webapp.docker_image }}
-        imagePullPolicy: Always
-        {{- if $webapp.extra_environment }}
-        env:
-          {{- include "georchestra.common-envs" . | nindent 10 }}
-          {{- $webapp.extra_environment | toYaml | nindent 10 }}
-        {{- end }}
-        ports:
-        - containerPort: 8080
-          name: http-proxy
-        volumeMounts:
-          - mountPath: /etc/georchestra
-            name: georchestra-datadir
-        livenessProbe:
-          httpGet:
-            path: /mapfishapp/
-            port: 8080
-          periodSeconds: 10
-        startupProbe:
-          tcpSocket:
-            port: 8080
-          failureThreshold: 5
-          periodSeconds: 30
-      volumes:
-      - name: georchestra-datadir
-        emptyDir: {}
-      {{- if .Values.georchestra.datadir.git.ssh_secret }}
-      - name: ssh-secret
-        secret:
-          secretName: {{ .Values.georchestra.datadir.git.ssh_secret }}
-          defaultMode: 0400
-      {{- end }}
-      {{- if $webapp.registry_secret }}
-      imagePullSecrets:
-      - name: {{ $webapp.registry_secret }}
-      {{- end }}
-{{- end }}
-
diff --git a/templates/mapfishapp/mapfishapp-svc.yaml b/templates/mapfishapp/mapfishapp-svc.yaml
deleted file mode 100644
index 0c8862a..0000000
--- a/templates/mapfishapp/mapfishapp-svc.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-{{- $webapp := .Values.georchestra.webapps.mapfishapp -}}
-{{- if $webapp.enabled -}}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "georchestra.fullname" . }}-mapfishapp-svc
-  labels:
-    {{- include "georchestra.labels" . | nindent 4 }}
-    app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-mapfishapp
-  {{- with $webapp.service.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  ports:
-  - port: 8080
-    protocol: TCP
-    targetPort: 8080
-  selector:
-    org.georchestra.service/name: {{ include "georchestra.fullname" . }}-mapfishapp
-{{- end }}
\ No newline at end of file
diff --git a/templates/tests/webapps-test.yaml b/templates/tests/webapps-test.yaml
index 76f5319..7e0a06f 100644
--- a/templates/tests/webapps-test.yaml
+++ b/templates/tests/webapps-test.yaml
@@ -106,24 +106,6 @@ spec:
       args: ['http://{{ include "georchestra.fullname" . }}-header-svc:8080/header/']
   restartPolicy: Never
 {{- end }}
-{{- if .Values.georchestra.webapps.mapfishapp.enabled -}}
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ include "georchestra.fullname" . }}-test-mapfishapp"
-  labels:
-    {{- include "georchestra.labels" . | nindent 4 }}
-    org.georchestra.pod/purpose: test
-  annotations:
-    "helm.sh/hook": test
-spec:
-  containers:
-    - name: curl
-      image: curlimages/curl
-      args: ['http://{{ include "georchestra.fullname" . }}-mapfishapp-svc:8080/mapfishapp/']
-  restartPolicy: Never
-{{- end }}
 {{- if .Values.georchestra.webapps.mapstore.enabled -}}
 ---
 apiVersion: v1
diff --git a/values.yaml b/values.yaml
index 1be57c0..5e0a0b1 100644
--- a/values.yaml
+++ b/values.yaml
@@ -62,14 +62,6 @@ georchestra:
       # registry_secret: default
       service:
         annotations: {}
-    extractorapp:
-      enabled: false
-      replicaCount: "1"
-      docker_image: georchestra/extractorapp:latest
-      extra_environment: []
-      # registry_secret: default
-      service:
-        annotations: {}
     geonetwork:
       enabled: true
       replicaCount: "1"
@@ -147,14 +139,6 @@ georchestra:
       # registry_secret: default
       service:
         annotations: {}
-    mapfishapp:
-      enabled: false
-      replicaCount: "1"
-      docker_image: georchestra/mapfishapp:latest
-      extra_environment: []
-      # registry_secret: default
-      service:
-        annotations: {}
     mapstore:
       enabled: true
       replicaCount: "1"