diff --git a/Makefile b/Makefile
index 6929a5f..0b502b1 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,8 @@
 DOCKER_LABEL_COMMIT_DATE ?= $(shell git diff-index --quiet HEAD -- && git show -s --format=%cd --date=iso-strict HEAD || echo "unknown" )
 DOCKER_LABEL_BUILD_DATE  ?= $(shell date -u "+%Y-%m-%dT%H:%M:%SZ")
 
-all: test
+all: test docker-build
+
 docker-build:
 	docker build $(DOCKER_BUILD_ARGS) \
 	-t ${DOCKER_IMAGENAME} \
@@ -42,10 +43,12 @@
 	--build-arg org_label_schema_build_date="${DOCKER_LABEL_BUILD_DATE}" \
 	--build-arg org_opencord_vcs_commit_date="${DOCKER_LABEL_COMMIT_DATE}" \
 	-f Dockerfile .
+
 docker-push:
 	docker push ${DOCKER_IMAGENAME}
 
-test: docker-build
+test:
+	@echo "No tests available"
 
 clean:
 	@echo "No cleanup available"
diff --git a/config/conf.yaml b/config/conf.yaml
index 57b13ed..633273a 100644
--- a/config/conf.yaml
+++ b/config/conf.yaml
@@ -7,7 +7,7 @@
     - voltha.kpis
     - onos.kpis
     - onos.aaa.stats.kpis
-    - pppoe.stats
+    - bng.stats
 logger:
   loglevel: debug
   host: cord-kafka.default.svc.cluster.local:9092