diff --git a/geant-tcs/docs/de/csr_generation_gnutls.md b/geant-tcs/docs/de/csr_generation_gnutls.md
index 0e600677e0551785b315dd5bd8df0c6682fcd9d4..3fe1ecdc322eba872797c9cad7afff930cbd0d39 100644
--- a/geant-tcs/docs/de/csr_generation_gnutls.md
+++ b/geant-tcs/docs/de/csr_generation_gnutls.md
@@ -13,7 +13,7 @@ Verwenden Sie folgenden Befehl, um den privaten Schlüssel zu generieren:
 ```
 certtool --generate-privkey \
   xGNUTLS_KEY_TYPEx \
-  --outfile xCSR_SERVER_KEYFILEx
+  --outfile 'xCSR_SERVER_KEYFILEx'
 ```
  
 Legen Sie eine Template-Datei namens `xCSR_SERVER_TEMPLATEFILEx` mit folgendem Inhalt:
@@ -39,8 +39,8 @@ Erzeugen Sie nun die Antragsdatei:
 
 ```
 certtool --generate-request --hash SHA256 --no-text \
- --load-privkey xCSR_SERVER_KEYFILEx \
- --template xCSR_SERVER_TEMPLATEFILEx \
- --outfile xCSR_SERVER_REQFILEx
+ --load-privkey 'xCSR_SERVER_KEYFILEx' \
+ --template 'xCSR_SERVER_TEMPLATEFILEx' \
+ --outfile 'xCSR_SERVER_REQFILEx'
 ```	
 
diff --git a/geant-tcs/docs/de/csr_generation_java.md b/geant-tcs/docs/de/csr_generation_java.md
index 27b2150f5039adad68b4f4390fa1e5957e84a82e..85c68e3bad9b2caaef006beda0c50705fa36c386 100644
--- a/geant-tcs/docs/de/csr_generation_java.md
+++ b/geant-tcs/docs/de/csr_generation_java.md
@@ -10,17 +10,17 @@ Dies kann mit folgendem Befehl über die Kommandozeile erfolgen:
 
 ```
 keytool -genkey \
- -alias xCSR_SERVER_CNx \
- -dname "CN=xCSR_SERVER_CNx" \
+ -alias 'xCSR_SERVER_CNx' \
+ -dname 'CN=xCSR_SERVER_CNx' \
  xJAVACERTTOOL_KEY_TYPEx \
- -keystore xCSR_SERVER_KEYSTOREx
+ -keystore 'xCSR_SERVER_KEYSTOREx'
 ``` 
 
 Aus diesem Schlüsselpaar kann jetzt der Zertifikatsantrag generiert werden:
 
 ```
 keytool -certreq \
- -alias xCSR_SERVER_CNx \
- -file xCSR_SERVER_REQFILEx \
- -keystore xCSR_SERVER_KEYSTOREx
+ -alias 'xCSR_SERVER_CNx' \
+ -file 'xCSR_SERVER_REQFILEx' \
+ -keystore 'xCSR_SERVER_KEYSTOREx'
 ```
\ No newline at end of file
diff --git a/geant-tcs/docs/de/csr_generation_openssl.md b/geant-tcs/docs/de/csr_generation_openssl.md
index dc9d3232c787131f5ed814808327a783ceaec988..eb87fb0246ed6eb1762dbf207a9b2c80ffb6513a 100644
--- a/geant-tcs/docs/de/csr_generation_openssl.md
+++ b/geant-tcs/docs/de/csr_generation_openssl.md
@@ -12,8 +12,8 @@ Mit [OpenSSL](https://www.openssl.org/){:target="_blank"} (Version 3.x nötig) k
 
 ```
 openssl req dOPENSSL_KEY_TYPEd dCSR_PKEY_ENCRYPTEDd \
- -out xCSR_SERVER_REQFILEx \
- -keyout xCSR_SERVER_KEYFILEx \
+ -out 'xCSR_SERVER_REQFILEx' \
+ -keyout 'xCSR_SERVER_KEYFILEx' \
  -subj '/CN=xCSR_SERVER_CNx'
 ```
 
@@ -27,8 +27,8 @@ Jedem Hostname muss `DNS:` vorangestellt werden, mehrere Einträge sind mit `,`
 
 ```
 openssl req dOPENSSL_KEY_TYPEd dCSR_PKEY_ENCRYPTEDd \
- -out xCSR_SERVER_REQFILEx \
- -keyout xCSR_SERVER_KEYFILEx \
+ -out 'xCSR_SERVER_REQFILEx' \
+ -keyout 'xCSR_SERVER_KEYFILEx' \
  -subj '/CN=xCSR_SERVER_CNx' \
  -addext 'subjectAltName = DNS:weiterer-hostname.ifmb.kit.edu,DNS:noch-ein-hostname.ifmb.kit.edu'
 ```
diff --git a/geant-tcs/docs/en/csr_generation_gnutls.md b/geant-tcs/docs/en/csr_generation_gnutls.md
index ecfe8819f3918dd8fd2b0c8bc937823e0247d696..726d6761b7ae20fb111c33393ea52830d058bc13 100644
--- a/geant-tcs/docs/en/csr_generation_gnutls.md
+++ b/geant-tcs/docs/en/csr_generation_gnutls.md
@@ -13,7 +13,7 @@ Use the following command in order to generate the private key:
 ```
 certtool --generate-privkey \
   xGNUTLS_KEY_TYPEx \
-  --outfile xCSR_SERVER_KEYFILEx
+  --outfile 'xCSR_SERVER_KEYFILEx'
 ```
 
 Create a template file named `xCSR_SERVER_TEMPLATEFILEx` containing the following content:
@@ -38,8 +38,8 @@ You can now create the CSR:
 
 ```
 certtool --generate-request --hash SHA256 --no-text \
- --load-privkey xCSR_SERVER_KEYFILEx \
- --template xCSR_SERVER_TEMPLATEFILEx \
- --outfile xCSR_SERVER_REQFILEx
+ --load-privkey 'xCSR_SERVER_KEYFILEx' \
+ --template 'xCSR_SERVER_TEMPLATEFILEx' \
+ --outfile 'xCSR_SERVER_REQFILEx'
 ```	
 
diff --git a/geant-tcs/docs/en/csr_generation_java.md b/geant-tcs/docs/en/csr_generation_java.md
index 58346b4f64e4f5bfaf1a144bc812fce5a5de069c..bf7128d310619f29ac48b618d4df1633f8831ce2 100644
--- a/geant-tcs/docs/en/csr_generation_java.md
+++ b/geant-tcs/docs/en/csr_generation_java.md
@@ -1,4 +1,4 @@
-!!! note "Configure Certificate"
+_!!! note "Configure Certificate"
     Please enter the hostname for which you want to request a certificate:  
     <input data-input-for="CSR_SERVER_CN">
     
@@ -10,17 +10,17 @@ This is done with the following command:
 
 ```
 keytool -genkey \
- -alias xCSR_SERVER_CNx \
- -dname "CN=xCSR_SERVER_CNx" \
+ -alias 'xCSR_SERVER_CNx' \
+ -dname 'CN=xCSR_SERVER_CNx' \
  xJAVACERTTOOL_KEY_TYPEx \
- -keystore xCSR_SERVER_KEYSTOREx
+ -keystore 'xCSR_SERVER_KEYSTOREx'
 ``` 
 
 Using this keypair, you can now create the CSR:
 
 ```
 keytool -certreq \
- -alias xCSR_SERVER_CNx \
- -file xCSR_SERVER_REQFILEx \
- -keystore xCSR_SERVER_KEYSTOREx
+ -alias 'xCSR_SERVER_CNx' \
+ -file 'xCSR_SERVER_REQFILEx' \
+ -keystore 'xCSR_SERVER_KEYSTOREx'
 ```
\ No newline at end of file
diff --git a/geant-tcs/docs/en/csr_generation_openssl.md b/geant-tcs/docs/en/csr_generation_openssl.md
index b74d361e41c902341be392401b899f2d73354878..b0c191d5f083f35c27173f1207b0aad6d305375c 100644
--- a/geant-tcs/docs/en/csr_generation_openssl.md
+++ b/geant-tcs/docs/en/csr_generation_openssl.md
@@ -13,8 +13,8 @@ Using [OpenSSL](https://www.openssl.org/){:target="_blank"} (version 3.x require
 
 ```
 openssl req dOPENSSL_KEY_TYPEd dCSR_PKEY_ENCRYPTEDd \
- -out xCSR_SERVER_REQFILEx \
- -keyout xCSR_SERVER_KEYFILEx \
+ -out 'xCSR_SERVER_REQFILEx' \
+ -keyout 'xCSR_SERVER_KEYFILEx' \
  -subj '/CN=xCSR_SERVER_CNx'
 ```
 
@@ -30,8 +30,8 @@ Every hostname must be prefixed with `DNS:`, multiple entries must be seperated
 
 ```
 openssl req dOPENSSL_KEY_TYPEd dCSR_PKEY_ENCRYPTEDd \
- -out xCSR_SERVER_REQFILEx \
- -keyout xCSR_SERVER_KEYFILEx \
+ -out 'xCSR_SERVER_REQFILEx' \
+ -keyout 'xCSR_SERVER_KEYFILEx' \
  -subj '/CN=xCSR_SERVER_CNx' \
  -addext 'subjectAltName = DNS:additional-hostname.ifmb.kit.edu,DNS:another-hostname.ifmb.kit.edu'
 ```