diff --git a/Dockerfile b/Dockerfile
index 88954ee..95021c4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ARG HOST_PWD
 # Install required packages
 RUN DEBIAN_FRONTEND=noninteractive \
   apt-get update \
-  && apt-get install -y python3 python3-jinja2 openssl openjdk-17-jdk curl
+  && apt-get install -y python3 python3-jinja2 openssl openjdk-17-jdk git-crypt curl
 
 # Install docker-compose
 RUN curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
diff --git a/pki_playground.py b/pki_playground.py
index 62fcaac..830bd38 100755
--- a/pki_playground.py
+++ b/pki_playground.py
@@ -265,7 +265,7 @@ def _generate_server_certs(pki_name: str, server_domain: str) -> None:
         "-CAkey",
         f"../../{pki_name}.key",
         "-subj", 
-        f"/C=UA/ST=Kiev Oblast/L=?/O=A? Corp/OU=IT Dept/CN={server_domain}",
+        f"/C=UA/ST=Kiev Oblast/L=Something/O=Something Corp/OU=IT Dept/CN={server_domain}",
         "-CAcreateserial",
         "-out",
         f"{server_domain}.crt",
@@ -295,9 +295,9 @@ def _generate_server_certs(pki_name: str, server_domain: str) -> None:
         "-passout",
         f"pass:{keystore_password}",
         "-inkey",
-        f"../../{pki_name}.key",
+        f"../../private.{pki_name}.key",
         "-in",
-        f"../../{pki_name}.crt",
+        f"../../servers/{server_domain}/{server_domain}.crt",
         "-certfile",
         f"../../{pki_name}.crt",
         "-name",
diff --git a/pkis/csr_template.j2 b/pkis/csr_template.j2
index 9d72c48..4e59481 100644
Binary files a/pkis/csr_template.j2 and b/pkis/csr_template.j2 differ