diff --git a/Makefile b/Makefile
index 430a3f4..50d17eb 100644
--- a/Makefile
+++ b/Makefile
@@ -80,25 +80,25 @@ farm04:
 	mkdir -p /etc/pki/libvirt/private/
 	cp /etc/pki/CA/farm04_server_certificate.pem /etc/pki/libvirt/servercert.pem
 	cp /etc/pki/CA/farm04_server_key.pem /etc/pki/libvirt/private/serverkey.pem
-	cp /etc/pki/CA/farm04_client_certificate.pem /etc/pki/libvirt/clientcert.pem
-	cp /etc/pki/CA/farm04_client_key.pem /etc/pki/libvirt/private/clientkey.pem
+	#cp /etc/pki/CA/farm04_client_certificate.pem /etc/pki/libvirt/clientcert.pem
+	#cp /etc/pki/CA/farm04_client_key.pem /etc/pki/libvirt/private/clientkey.pem
 
 farm05:
 	cp /etc/pki/CA/certificate_authority_certificate.pem /etc/pki/CA/cacert.pem
 	mkdir -p /etc/pki/libvirt/private/
 	cp /etc/pki/CA/farm05_server_certificate.pem /etc/pki/libvirt/servercert.pem
 	cp /etc/pki/CA/farm05_server_key.pem /etc/pki/libvirt/private/serverkey.pem
-	cp /etc/pki/CA/farm05_client_certificate.pem /etc/pki/libvirt/clientcert.pem
-	cp /etc/pki/CA/farm05_client_key.pem /etc/pki/libvirt/private/clientkey.pem
+	#cp /etc/pki/CA/farm05_client_certificate.pem /etc/pki/libvirt/clientcert.pem
+	#cp /etc/pki/CA/farm05_client_key.pem /etc/pki/libvirt/private/clientkey.pem
 
 list-farm01:
 	virsh -c qemu://farm01/system list
 
 list-farm02:
-	virsh -c qemu://farm02/system list
+	virsh -c qemu://farm02.wit.com/system list
 
 list-farm03:
-	virsh -c qemu://farm03/system list
+	virsh -c qemu://farm03.wit.com/system list
 
 list-farm04:
 	virsh -c qemu://farm04/system list
diff --git a/client/Makefile b/client/Makefile
index 6f1ac0d..265580c 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -4,14 +4,24 @@ info:
 all:
 	certtool --generate-privkey > farm01_client_key.pem
 	certtool --generate-privkey > farm02_client_key.pem
+	certtool --generate-privkey > farm03_client_key.pem
 	certtool --generate-privkey > admin_desktop_client_key.pem
 	make farm01-client
 	make farm02-client
+	make farm03-client
 	make admin-client
 
 clean:
 	rm *.pem
 
+admin-client:
+	certtool --generate-certificate \
+		--template admin_desktop_client_template.info \
+		--load-privkey admin_desktop_client_key.pem \
+		--load-ca-certificate ../certificate_authority_certificate.pem \
+		--load-ca-privkey ../certificate_authority_key.pem \
+		--outfile admin_desktop_client_certificate.pem
+
 farm01-client:
 	certtool --generate-certificate \
 		--template farm01_client_template.info \
@@ -28,10 +38,10 @@ farm02-client:
 		--load-ca-privkey ../certificate_authority_key.pem \
 		--outfile farm02_client_certificate.pem
 
-admin-client:
+farm03-client:
 	certtool --generate-certificate \
-		--template admin_desktop_client_template.info \
-		--load-privkey admin_desktop_client_key.pem \
+		--template farm03_client_template.info \
+		--load-privkey farm03_client_key.pem \
 		--load-ca-certificate ../certificate_authority_certificate.pem \
 		--load-ca-privkey ../certificate_authority_key.pem \
-		--outfile admin_desktop_client_certificate.pem
+		--outfile farm03_client_certificate.pem
diff --git a/client/farm02_client_template.info b/client/farm02_client_template.info
index efddc23..5ba05e1 100644
--- a/client/farm02_client_template.info
+++ b/client/farm02_client_template.info
@@ -2,7 +2,7 @@ country = US
 state = Wisconsin
 locality = Madison
 organization = WIT.COM Inc.
-cn = farm02
+cn = farm02.wit.com
 tls_www_client
 encryption_key
 signing_key
diff --git a/client/farm03_client_template.info b/client/farm03_client_template.info
new file mode 100644
index 0000000..4730b60
--- /dev/null
+++ b/client/farm03_client_template.info
@@ -0,0 +1,8 @@
+country = US
+state = Wisconsin
+locality = Madison
+organization = WIT.COM Inc.
+cn = farm03
+tls_www_client
+encryption_key
+signing_key
diff --git a/farm/farm02_server_template.info b/farm/farm02_server_template.info
index 4695e18..22f0b28 100644
--- a/farm/farm02_server_template.info
+++ b/farm/farm02_server_template.info
@@ -1,5 +1,5 @@
 organization = WIT.COM Inc.
-cn = farm02
+cn = farm02.wit.com
 tls_www_server
 encryption_key
 signing_key