diff --git a/Makefile b/Makefile
index a6493e6..d0f6c43 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,8 @@
 	nosetests -s -v --with-id --with-coverage --cover-html --cover-erase --cover-xml --cover-package="grpc_client, tosca"
 
 build:
-	docker build -t xosproject/xos-tosca --no-cache=true .
+	docker build -t xosproject/xos-tosca .
+	docker tag xosproject/xos-tosca:latest xosproject/xos-tosca:candidate
 
 start: build
 	docker run -p 9200:9200 --name xos-tosca -d xosproject/xos-tosca
@@ -27,4 +28,5 @@
 	curl -H "xos-username: xosadmin@opencord.org" -H "xos-password: rk1UYDHZXbu6KVCMkhmV" -X POST --data-binary @test/tosca/test.yaml 127.0.0.1:9102/delete
 
 tosca:
-	xosgenx --target=src/tosca/xtarget/tosca.xtarget --output=src/tosca/custom_types --write-to-file=target ../xos/xos/core/models/core.xproto
\ No newline at end of file
+	xosgenx --target=src/tosca/xtarget/tosca.xtarget --output=src/tosca/custom_types --write-to-file=target ../xos/xos/core/models/core.xproto
+	xosgenx --target=src/tosca/xtarget/tosca_keys.xtarget --output=src/grpc_client/ --write-to-file=single --dest-file=KEYS.py ../xos/xos/core/models/core.xproto
\ No newline at end of file