diff --git a/Makefile b/Makefile
index 2f8071f97..893fcf4bf 100755
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY : docker-build docker-push release build-issuer-hsm build-apigw-saml build-apigw-oidcrp build-apigw-all test-saml test-oidcrp test-vc20 test-pkcs11 test-all-tags docker-build-apigw-saml docker-build-apigw-oidcrp docker-build-apigw-all docker-build-issuer-hsm
+.PHONY : docker-build docker-push release build-issuer-hsm build-apigw-saml build-apigw-oidcrp build-apigw-all test-saml test-oidcrp test-vc20 test-pkcs11 test-all-tags docker-build-apigw-saml docker-build-apigw-oidcrp docker-build-apigw-all docker-build-issuer-hsm pki
 
 NAME 					:= vc
 LDFLAGS                 := -ldflags "-w -s --extldflags '-static'"
@@ -8,6 +8,11 @@ SERVICES 				:= verifier registry persistent mockas apigw issuer ui wallet verif
 PORT                    := 8888
 W3C_TEST_SUITE_DIR      := /tmp/w3c-test-suite
 
+pki:
+	$(info Setting up PKI)
+	cd pki/; ./create_pki.sh
+	cd developer_tools/; ./gen_ec_sign_key.sh; ./gen_rsa_sign_key.sh
+
 test: test-verifier
 
 test-verifier:
diff --git a/README.md b/README.md
index fb5b2cc66..3ca8f1fb0 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,9 @@ linux/amd64 is consider supported, other build options may work.
 
 `make restart`
 
+### Setup PKI
+`make pki`
+
 ## Swagger
 
 ### Endpoint
diff --git a/pki/create_pki.sh b/pki/create_pki.sh
index 0faf3e272..17751d847 100755
--- a/pki/create_pki.sh
+++ b/pki/create_pki.sh
@@ -75,7 +75,7 @@ EOF
     # remove any generated config files
     if [ $conf_generated -eq 1 ]; then
 	    rm ${service_name}.conf
-        rm ca.conf
+        rm -f ca.conf
     fi
     if [ $ext_generated -eq 1 ]; then
 	    rm ${service_name}.ext