diff --git a/extra/docker/elk/docker-compose.yml b/extra/docker/elk/docker-compose.yml
index bba6791..3c5652a 100644
--- a/extra/docker/elk/docker-compose.yml
+++ b/extra/docker/elk/docker-compose.yml
@@ -25,7 +25,7 @@
     networks:
       es_net:
     environment:
-      - dmaap_base_url=http://localhost:3904/
+      - dmaap_base_url=http://dmaapmocker:3904/
       - dmaap_user=user
       - dmaap_password=password
       - dmaap_consumer_group=CG42
@@ -36,53 +36,18 @@
       - elasticsearch_hosts=elasticsearch
 
   kibana:
-    image: docker.elastic.co/kibana/kibana-oss:6.1.3
+    image: onap/clamp-dashboard-kibana:latest
+    build:
+      context: ../../../src/main/docker/kibana
+      dockerfile: Dockerfile.kibana
     ports:
       - 5601:5601
     depends_on:
       - elasticsearch
-    networks:
-      es_net:
-
-  backup:
-    image: taskrabbit/elasticsearch-dump
-    depends_on:
-      - elasticsearch
-    command:
-      - --input=http://elasticsearch:9200/.kibana
-      - --output=/backups/backup.json
-      - --type=data
     volumes:
-      - ./es_backup/:/backups/
+      - ../../../src/main/docker/kibana/saved-objects/:/saved-objects/
     networks:
       es_net:
 
-  restore:
-    image: taskrabbit/elasticsearch-dump
-    depends_on:
-      - elasticsearch
-    command:
-      - --output=http://elasticsearch:9200/.kibana
-      - --input=/backups/backup.json
-      - --type=data
-    volumes:
-      - ./es_backup/:/backups/
-    networks:
-      es_net:
-
-  default:
-    image: taskrabbit/elasticsearch-dump
-    depends_on:
-      - elasticsearch
-    command:
-      - --output=http://elasticsearch:9200/.kibana
-      - --input=/backups/default.json
-      - --type=data
-    volumes:
-      - ./es_backup/:/backups/
-    networks:
-      es_net:
-
-
 networks:
   es_net: