diff --git a/calix-pod1.yml b/calix-pod1.yml
index 24a9e24..39a8ddf 100644
--- a/calix-pod1.yml
+++ b/calix-pod1.yml
@@ -20,10 +20,6 @@
   - 'corddev'
 
 # Variables
-credentials_dir: '/opt/credentials'
-pki_dir: '/opt/pki'
-ssh_pki_dir: '/opt/ssh_pki'
-
 fabric_ip: '10.6.1.1/24'
 management_ip: '10.6.0.1/24'
 external_ip: '10.66.12.7/24'
diff --git a/flex-pod1.yml b/flex-pod1.yml
index a5e90fd..75e8faf 100644
--- a/flex-pod1.yml
+++ b/flex-pod1.yml
@@ -20,10 +20,6 @@
   - 'corddev'
 
 # Variables
-credentials_dir: '/opt/credentials'
-pki_dir: '/opt/pki'
-ssh_pki_dir: '/opt/ssh_pki'
-
 fabric_ip: '10.6.1.1/24'
 management_ip: '10.6.0.1/24'
 external_ip: '10.192.4.62/24'
diff --git a/nttcomm-pod1.yml b/nttcomm-pod1.yml
index 38d398a..9db156f 100644
--- a/nttcomm-pod1.yml
+++ b/nttcomm-pod1.yml
@@ -20,10 +20,6 @@
   - 'corddev'
 
 # Variables
-credentials_dir: '/opt/credentials'
-pki_dir: '/opt/pki'
-ssh_pki_dir: '/opt/ssh_pki'
-
 fabric_ip: '10.6.1.1/24'
 management_ip: '10.6.0.1/24'
 external_ip: '192.168.18.61/24'
diff --git a/ntteast-pod1.yml b/ntteast-pod1.yml
index e0e95cd..6e25233 100644
--- a/ntteast-pod1.yml
+++ b/ntteast-pod1.yml
@@ -20,10 +20,6 @@
   - 'corddev'
 
 # Variables
-credentials_dir: '/opt/credentials'
-pki_dir: '/opt/pki'
-ssh_pki_dir: '/opt/ssh_pki'
-
 fabric_ip: '10.6.1.1/24'
 management_ip: '10.6.0.1/24'
 external_ip: '192.168.99.61/24'
diff --git a/onlab-mcord-pod1.yml b/onlab-mcord-pod1.yml
index f2c80e6..361c014 100644
--- a/onlab-mcord-pod1.yml
+++ b/onlab-mcord-pod1.yml
@@ -20,10 +20,6 @@
   - 'corddev'
 
 # Variables
-credentials_dir: '/opt/credentials'
-pki_dir: '/opt/pki'
-ssh_pki_dir: '/opt/ssh_pki'
-
 fabric_ip: '10.6.1.1/24'
 management_ip: '10.6.0.1/24'
 external_ip: '10.90.2.10/16'
diff --git a/onlab.yml b/onlab.yml
index e2888de..872649e 100644
--- a/onlab.yml
+++ b/onlab.yml
@@ -20,10 +20,6 @@
   - 'corddev'
 
 # Variables
-credentials_dir: '/opt/credentials'
-pki_dir: '/opt/pki'
-ssh_pki_dir: '/opt/ssh_pki'
-
 fabric_ip: '10.6.1.1/24'
 management_ip: '10.6.0.1/24'
 external_ip: '10.90.0.251/24'
diff --git a/qct-pod1.yml b/qct-pod1.yml
index b9928e5..ff36c33 100644
--- a/qct-pod1.yml
+++ b/qct-pod1.yml
@@ -20,10 +20,6 @@
   - 'corddev'
 
 # Variables
-credentials_dir: '/opt/credentials'
-pki_dir: '/opt/pki'
-ssh_pki_dir: '/opt/ssh_pki'
-
 fabric_ip: '10.6.1.1/24'
 management_ip: '10.6.0.1/24'
 external_ip: '10.201.101.11/24'
diff --git a/qct-pod2-dpdk.yml b/qct-pod2-dpdk.yml
index 5ff606e..4a5dd36 100644
--- a/qct-pod2-dpdk.yml
+++ b/qct-pod2-dpdk.yml
@@ -20,10 +20,6 @@
   - 'corddev'
 
 # Variables
-credentials_dir: '/opt/credentials'
-pki_dir: '/opt/pki'
-ssh_pki_dir: '/opt/ssh_pki'
-
 fabric_ip: '10.6.1.1/24'
 management_ip: '10.6.0.1/24'
 external_ip: '10.201.101.21/24'
diff --git a/qct-pod2.yml b/qct-pod2.yml
index d3d8024..1878517 100644
--- a/qct-pod2.yml
+++ b/qct-pod2.yml
@@ -20,10 +20,6 @@
   - 'corddev'
 
 # Variables
-credentials_dir: '/opt/credentials'
-pki_dir: '/opt/pki'
-ssh_pki_dir: '/opt/ssh_pki'
-
 fabric_ip: '10.6.1.1/24'
 management_ip: '10.6.0.1/24'
 external_ip: '10.201.101.21/24'
diff --git a/qct-pod3.yml b/qct-pod3.yml
index b674621..e66d6c1 100644
--- a/qct-pod3.yml
+++ b/qct-pod3.yml
@@ -20,10 +20,6 @@
   - 'corddev'
 
 # Variables
-credentials_dir: '/opt/credentials'
-pki_dir: '/opt/pki'
-ssh_pki_dir: '/opt/ssh_pki'
-
 fabric_ip: '10.6.1.1/24'
 management_ip: '10.6.0.1/24'
 external_ip: '10.201.101.31/24'
diff --git a/qct-pod4-mcord.yml b/qct-pod4-mcord.yml
index f0c2363..94595c4 100644
--- a/qct-pod4-mcord.yml
+++ b/qct-pod4-mcord.yml
@@ -20,10 +20,6 @@
   - 'corddev'
 
 # Variables
-credentials_dir: '/opt/credentials'
-pki_dir: '/opt/pki'
-ssh_pki_dir: '/opt/ssh_pki'
-
 fabric_ip: '10.6.1.1/24'
 management_ip: '10.6.0.1/24'
 external_ip: '10.201.101.41/24'
diff --git a/qct-pod4.yml b/qct-pod4.yml
index 19249bc..c6f00a0 100644
--- a/qct-pod4.yml
+++ b/qct-pod4.yml
@@ -20,10 +20,6 @@
   - 'corddev'
 
 # Variables
-credentials_dir: '/opt/credentials'
-pki_dir: '/opt/pki'
-ssh_pki_dir: '/opt/ssh_pki'
-
 fabric_ip: '10.6.1.1/24'
 management_ip: '10.6.0.1/24'
 external_ip: '10.201.101.41/24'