diff --git a/host_vars/epolsa5069bit03.yml b/host_vars/epolsa5069bit03.yml
new file mode 100644
index 0000000..e9e5128
--- /dev/null
+++ b/host_vars/epolsa5069bit03.yml
@@ -0,0 +1,2 @@
+---
+  sso_principal_name: "polsa5069bit03.tpolizei-bw.de"
diff --git a/host_vars/epolsa5073bit03.yml b/host_vars/epolsa5073bit03.yml
new file mode 100644
index 0000000..453c519
--- /dev/null
+++ b/host_vars/epolsa5073bit03.yml
@@ -0,0 +1,2 @@
+---
+  sso_principal_name: "polsa5073bit03.tpolizei-bw.de"
diff --git a/host_vars/polsa5079bit03.yml b/host_vars/polsa5079bit03.yml
new file mode 100644
index 0000000..1f6a247
--- /dev/null
+++ b/host_vars/polsa5079bit03.yml
@@ -0,0 +1,2 @@
+---
+  sso_principal_name: "polsa5079bit03.polizei-bw.net"
diff --git a/host_vars/polsa5079stu02.yml b/host_vars/polsa5079stu02.yml
new file mode 100644
index 0000000..1acf0bd
--- /dev/null
+++ b/host_vars/polsa5079stu02.yml
@@ -0,0 +1,2 @@
+---
+  sso_principal_name: "polsa5079stu02.polizei-bw.net"
diff --git a/host_vars/spolsa5069stu02.yml b/host_vars/spolsa5069stu02.yml
new file mode 100644
index 0000000..95d872f
--- /dev/null
+++ b/host_vars/spolsa5069stu02.yml
@@ -0,0 +1,2 @@
+---
+  sso_principal_name: "polsa5069stu02.spolizei-bw.edu"
diff --git a/roles/ams_0016_14.1.2.0/templates/rsWebserviceAppserver.conf.j2 b/roles/ams_0016_14.1.2.0/templates/rsWebserviceAppserver.conf.j2
index a9297f8..7b6a1a8 100644
--- a/roles/ams_0016_14.1.2.0/templates/rsWebserviceAppserver.conf.j2
+++ b/roles/ams_0016_14.1.2.0/templates/rsWebserviceAppserver.conf.j2
@@ -61,13 +61,14 @@ wrapper.java.additional.auto_bits=TRUE
 
 # Java Additional Parameters
 wrapper.java.additional.1=-server
-wrapper.java.additional.2=-XX:ErrorFile="%RS_HOME%/service/log/rsWebserviceAppserver_hs_err_pid%p.log"
+wrapper.java.additional.2=-XX:ErrorFile="/opt/logs/appserver/rsWebserviceAppserver_hs_err_pid%p.log"
 wrapper.java.additional.2.stripquotes=TRUE
 wrapper.java.additional.3=-Djava.io.tmpdir="%TEMP%"
 wrapper.java.additional.3.stripquotes=TRUE
 wrapper.java.additional.4=-XX:+DisableAttachMechanism 
 wrapper.java.additional.5=-Drola.config="%SHARED_HOME%/config"
 wrapper.java.additional.5.stripquotes=TRUE
+wrapper.java.additional.100=-Dsun.security.krb5.debug=true
 
 # Java Parameters for general webservice HTTP access
 wrapper.java.additional.6=-Djetty.host={{ ansible_facts['default_ipv4']['address'] }}
@@ -97,7 +98,7 @@ wrapper.java.additional.8.stripquotes=TRUE
 
 #wrapper.java.additional.21=-Djetty.https.host=<Hostname or IP>
 #wrapper.java.additional.22=-Djetty.https.port=443
-#wrapper.java.additional.23=-Djetty.logdir="%RS_HOME%/service/log/rsWebserviceAppserver-jetty/"
+#wrapper.java.additional.23=-Djetty.logdir="/opt/logs/appserver/rsWebserviceAppserver-jetty/"
 #wrapper.java.additional.23.stripquotes=TRUE
 
 #Activate UTF-8  support for gss kerberos authentication.
@@ -139,16 +140,16 @@ wrapper.app.parameter.20.stripquotes=TRUE
 # Wrapper Logging Properties
 #********************************************************************
 # Enables Debug output from the Wrapper.
-# wrapper.debug=TRUE
+wrapper.debug=TRUE
 
 # Format of output for the console.  (See docs for formats)
 wrapper.console.format=PM
 
 # Log Level for console output.  (See docs for log levels)
-wrapper.console.loglevel=STATUS
+wrapper.console.loglevel=DEBUG
 
 # Log file to use for wrapper output logging.
-wrapper.logfile="{{ LOG_DIR }}/appserver/rsWebserviceAppserver-servicewrapper.log"
+wrapper.logfile="/opt/logs/appserver/rsWebserviceAppserver-servicewrapper.log"
 
 # Format of output for the log file.  (See docs for formats)
 wrapper.logfile.format=LPTM
diff --git a/roles/ams_0016_14.1.2.0/templates/rsWebserviceAppserver.xml.j2 b/roles/ams_0016_14.1.2.0/templates/rsWebserviceAppserver.xml.j2
index 65b853a..c6abc65 100644
--- a/roles/ams_0016_14.1.2.0/templates/rsWebserviceAppserver.xml.j2
+++ b/roles/ams_0016_14.1.2.0/templates/rsWebserviceAppserver.xml.j2
@@ -11,7 +11,7 @@
 		&key;
 		&pwd;
 		&common;
-		<InternalSwitch>JILIHFCANEDGBCLKCHILFLEPPFOBHGOADDJOBPAECCAHCIENCCECHJIAHIDFKOGFAFB</InternalSwitch>
+		<InternalSwitch></InternalSwitch>
 		<!-- Wird derzeit von der Charting-Komponente verwendet, wenn ein in der Entität hinterlegtes Bild auf dem Chart angezeigt werden soll. -->
 		<OutputDirectory>/opt/tmp/</OutputDirectory>
 		<!-- Pfad zum Internet Explorer. -->
@@ -243,7 +243,7 @@
 
 	<Krb5ServerConfiguration>
 		<!-- SPN des Servers der beim Exportieren der Keytab gesetzt wurde. -->
-		<ServerServicePrincipalName>HOST/{{ ansible_fqdn }}</ServerServicePrincipalName>
+		<ServerServicePrincipalName>HOST/{{ sso_principal_name }}</ServerServicePrincipalName>
 		<!-- Realm, aus der die Keytab exportiert wurde. -->
 		<ServerRealm>{{ sso_domain_upper }}</ServerRealm>
 		<!-- Pfad und Dateiame der Keytab für den konfigurierten SPN. -->
diff --git a/roles/ams_0016_14.1.2.0_AdminServer/templates/rsWebserviceAppserver.xml.j2 b/roles/ams_0016_14.1.2.0_AdminServer/templates/rsWebserviceAppserver.xml.j2
index 85b1475..29c08a2 100644
--- a/roles/ams_0016_14.1.2.0_AdminServer/templates/rsWebserviceAppserver.xml.j2
+++ b/roles/ams_0016_14.1.2.0_AdminServer/templates/rsWebserviceAppserver.xml.j2
@@ -243,11 +243,11 @@
 
 	<Krb5ServerConfiguration>
 		<!-- SPN des Servers der beim Exportieren der Keytab gesetzt wurde. -->
-		<ServerServicePrincipalName>HOST/{{ ansible_fqdn }}</ServerServicePrincipalName>
+		<ServerServicePrincipalName></ServerServicePrincipalName>
 		<!-- Realm, aus der die Keytab exportiert wurde. -->
-		<ServerRealm>{{ sso_domain_upper }}</ServerRealm>
+		<ServerRealm></ServerRealm>
 		<!-- Pfad und Dateiame der Keytab für den konfigurierten SPN. -->
-		<ServerKeytabPath>/etc/krb5.keytab</ServerKeytabPath>
+		<ServerKeytabPath></ServerKeytabPath>
 	</Krb5ServerConfiguration>
 
 	<Monitoring>