diff --git a/docker_images.yml b/docker_images.yml
index 1783f62..739e645 100644
--- a/docker_images.yml
+++ b/docker_images.yml
@@ -27,8 +27,6 @@
 # in buildable_images - those are automatically pulled
 
 pull_only_images:
-  - "gliderlabs/consul-server:0.6"
-  - "gliderlabs/registrator:v7"
   - "nginx:1.13"
   - "onosproject/onos:1.12.0"
   - "redis:3.2"
diff --git a/docs/install_virtual.md b/docs/install_virtual.md
index 897e71c..9ad4110 100644
--- a/docs/install_virtual.md
+++ b/docs/install_virtual.md
@@ -180,8 +180,6 @@
 26f8cd2e32df        rcord_fabric-synchronizer_1           docker-registry:5000/xosproject/fabric-synchronizer:candidate
 d99b09ec8e2c        rcord_xos_db_1                        docker-registry:5000/xosproject/xos-postgres:candidate
 2a22f4836172        rcord_xos_redis_1                     docker-registry:5000/redis:candidate
-392e6e4aa4cf        rcord_registrator_1                   docker-registry:5000/gliderlabs/registrator:candidate
-1899d7d561f9        rcord_consul_1                        docker-registry:5000/gliderlabs/consul-server:candidate
 ba4e6640a4f0        onosfabric_xos-onos_1                 docker-registry:5000/onosproject/onos:candidate
 35517eec96e1        onoscord_xos-onos_1                   xos/onos:candidate
 b591fd1c406f        mavenrepo                             docker-registry:5000/opencord/mavenrepo:candidate
@@ -190,7 +188,6 @@
 c02fd40982f6        provisioner                           docker-registry:5000/opencord/maas-provisioner:candidate
 9b4b481bf2f5        allocator                             docker-registry:5000/opencord/maas-allocator:candidate
 2276a0f258ad        generator                             docker-registry:5000/opencord/maas-generator:candidate
-bec8d53ebe12        storage                               docker-registry:5000/consul:candidate
 4475dddba35a        harvester                             docker-registry:5000/opencord/maas-harvester:candidate
 30d4996337bd        registry                              registry:2.4.0
 21289d8b63ff        registry-mirror                       registry:2.4.0
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
index 328e144..50fc97f 100644
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -129,12 +129,11 @@
 onosfabric_xos-onos_1                rcord_xos_db_1
 provisioner                          rcord_xos_gui_1
 rcord_addressmanager-synchronizer_1  rcord_xos_redis_1
-rcord_consul_1                       rcord_xos_tosca_1
+rcord_xos_tosca_1                    storage
 rcord_exampleservice-synchronizer_1  rcord_xos_ui_1
 rcord_fabric-synchronizer_1          rcord_xos_ws_1
 rcord_onos-synchronizer_1            registry
 rcord_openstack-synchronizer_1       registry-mirror
-rcord_registrator_1                  storage
 rcord_volt-synchronizer_1            switchq
 
 head:
diff --git a/image_logs/.gitignore b/image_logs/.gitignore
index 72e8ffc..1db00d7 100644
--- a/image_logs/.gitignore
+++ b/image_logs/.gitignore
@@ -1 +1,2 @@
 *
+!README.md
diff --git a/image_logs/README.md b/image_logs/README.md
index 712cbdc..68b3123 100644
--- a/image_logs/README.md
+++ b/image_logs/README.md
@@ -1,4 +1,3 @@
 # image_logs
 
 This directory contains logfiles of docker image creation, created by imagebuilder.py
-
diff --git a/logs/.gitignore b/logs/.gitignore
index 72e8ffc..1db00d7 100644
--- a/logs/.gitignore
+++ b/logs/.gitignore
@@ -1 +1,2 @@
 *
+!README.md
diff --git a/logs/README.md b/logs/README.md
index 4b10d0f..1411413 100644
--- a/logs/README.md
+++ b/logs/README.md
@@ -1,4 +1,3 @@
 # logs
 
 Datestamped log files created during make proces will appear here.
-
diff --git a/scenarios/controlkube/config.yml b/scenarios/controlkube/config.yml
index b6f6efe..2c482ed 100644
--- a/scenarios/controlkube/config.yml
+++ b/scenarios/controlkube/config.yml
@@ -113,8 +113,6 @@
   - "xosproject/xos-ws"
   - "xosproject/chameleon"
   - "xosproject/xos-synchronizer-base"
-  - "gliderlabs/consul-server"
-  - "gliderlabs/registrator"
   - "nginx"
   - "onosproject/onos"
   - "opencord/mavenrepo"
diff --git a/scenarios/controlpod/config.yml b/scenarios/controlpod/config.yml
index aaf8d5e..cef028c 100644
--- a/scenarios/controlpod/config.yml
+++ b/scenarios/controlpod/config.yml
@@ -75,8 +75,6 @@
   - "xosproject/xos-ws"
   - "xosproject/chameleon"
   - "xosproject/xos-synchronizer-base"
-  - "gliderlabs/consul-server"
-  - "gliderlabs/registrator"
   - "nginx"
   - "onosproject/onos"
   - "opencord/mavenrepo"
diff --git a/scenarios/cord/config.yml b/scenarios/cord/config.yml
index efc9289..d93e91b 100644
--- a/scenarios/cord/config.yml
+++ b/scenarios/cord/config.yml
@@ -132,8 +132,6 @@
   - "xosproject/xos-ws"
   - "xosproject/chameleon"
   - "xosproject/xos-synchronizer-base"
-  - "gliderlabs/consul-server"
-  - "gliderlabs/registrator"
   - "nginx"
   - "onosproject/onos"
   - "opencord/mavenrepo"
diff --git a/scenarios/local/config.yml b/scenarios/local/config.yml
index 8cc1311..8c82e8b 100644
--- a/scenarios/local/config.yml
+++ b/scenarios/local/config.yml
@@ -52,8 +52,6 @@
   - "xosproject/xos-ws"
   - "xosproject/chameleon"
   - "xosproject/xos-synchronizer-base"
-  - "gliderlabs/consul-server"
-  - "gliderlabs/registrator"
   - "redis"
   - "nginx"
   - "node"
diff --git a/scenarios/mock/config.yml b/scenarios/mock/config.yml
index 28bad70..5db6506 100644
--- a/scenarios/mock/config.yml
+++ b/scenarios/mock/config.yml
@@ -72,8 +72,6 @@
   - "xosproject/xos-tosca"
   - "xosproject/xos-ws"
   - "xosproject/chameleon"
-  - "gliderlabs/consul-server"
-  - "gliderlabs/registrator"
   - "nginx"
   - "redis"
   - "node"
diff --git a/scenarios/preppedkube/config.yml b/scenarios/preppedkube/config.yml
index d865e0d..ef4e85b 100644
--- a/scenarios/preppedkube/config.yml
+++ b/scenarios/preppedkube/config.yml
@@ -132,8 +132,6 @@
   - "xosproject/xos-ws"
   - "xosproject/chameleon"
   - "xosproject/xos-synchronizer-base"
-  - "gliderlabs/consul-server"
-  - "gliderlabs/registrator"
   - "nginx"
   - "onosproject/onos"
   - "opencord/mavenrepo"
diff --git a/scenarios/preppedpod/config.yml b/scenarios/preppedpod/config.yml
index 2c38e31..e928e1f 100644
--- a/scenarios/preppedpod/config.yml
+++ b/scenarios/preppedpod/config.yml
@@ -133,8 +133,6 @@
   - "xosproject/xos-ws"
   - "xosproject/chameleon"
   - "xosproject/xos-synchronizer-base"
-  - "gliderlabs/consul-server"
-  - "gliderlabs/registrator"
   - "nginx"
   - "onosproject/onos"
   - "opencord/mavenrepo"
diff --git a/scenarios/single/config.yml b/scenarios/single/config.yml
index 85393d2..d919c05 100644
--- a/scenarios/single/config.yml
+++ b/scenarios/single/config.yml
@@ -77,8 +77,6 @@
   - "xosproject/xos-ws"
   - "xosproject/chameleon"
   - "xosproject/xos-synchronizer-base"
-  - "gliderlabs/consul-server"
-  - "gliderlabs/registrator"
   - "nginx"
   - "onosproject/onos"
   - "opencord/mavenrepo"