diff --git a/roles/juju-setup/defaults/main.yml b/roles/juju-setup/defaults/main.yml
index 840f49d..3024e0e 100644
--- a/roles/juju-setup/defaults/main.yml
+++ b/roles/juju-setup/defaults/main.yml
@@ -1,12 +1,10 @@
 ---
 # juju-setup/defaults/main.yml
 
-juju_config_name: opencloud
-
 # note: juju_config_path and charm_versions are also set in
 # `juju-compute-setup/defaults/main.yml`.  Keep these in sync.
 
 juju_config_path: /usr/local/src/juju_config.yml
 charm_versions: {}
 
-pki_dir: "/opt/pki"
+pki_dir: "{{ playbook_dir }}/pki"