diff --git a/roles/podman_link/templates/home/config/containers/systemd/opensearch-dashboards.container b/roles/podman_link/templates/home/config/containers/systemd/opensearch-dashboards.container
index 6311b0c..ba01cb1 100644
--- a/roles/podman_link/templates/home/config/containers/systemd/opensearch-dashboards.container
+++ b/roles/podman_link/templates/home/config/containers/systemd/opensearch-dashboards.container
@@ -5,8 +5,8 @@ PartOf=link.target
 
 [Container]
 ContainerName=opensearch-dashboards
-#Environment=OPENSEARCH_USERNAME=admin
-#Environment=OPENSEARCH_PASSWORD={{ podman_link_opensearch_password }}
+Environment=OPENSEARCH_USERNAME=admin
+Environment=OPENSEARCH_PASSWORD={{ podman_link_opensearch_password  | replace("%", "%%") }}
 Image=registry.gitlab.com/digiresilience/link/link-stack/opensearch-dashboards:{{ podman_link_stack_version }}
 PublishPort=127.0.0.1:5601:5601
 Volume=/home/{{ podman_link_podman_rootless_user }}/opensearch-dashboards.yml:/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml:ro,Z
diff --git a/roles/podman_link/templates/home/config/containers/systemd/zammad-nginx.container b/roles/podman_link/templates/home/config/containers/systemd/zammad-nginx.container
index f7c57f0..af25e35 100644
--- a/roles/podman_link/templates/home/config/containers/systemd/zammad-nginx.container
+++ b/roles/podman_link/templates/home/config/containers/systemd/zammad-nginx.container
@@ -1,6 +1,6 @@
 [Unit]
-Requires=zammad-railsserver.service link.service
-After=zammad-railsserver.service link.service
+Requires=zammad-railsserver.service zammad-websocket.service link.service
+After=zammad-railsserver.service zammad-websocket.service link.service
 PartOf=link.target
 
 [Container]
diff --git a/roles/podman_link/templates/home/config/containers/systemd/zammad-opensearch.container b/roles/podman_link/templates/home/config/containers/systemd/zammad-opensearch.container
index 9b56e01..38a3db0 100644
--- a/roles/podman_link/templates/home/config/containers/systemd/zammad-opensearch.container
+++ b/roles/podman_link/templates/home/config/containers/systemd/zammad-opensearch.container
@@ -13,7 +13,7 @@ Environment=cluster.info.update.interval=1m
 Environment=node.name=opensearch-node1
 Environment=bootstrap.memory_lock=true
 Environment=OPENSEARCH_JAVA_OPTS="-Xms{{ podman_link_opensearch_memory_limit }}m -Xmx{{podman_link_opensearch_memory_limit }}m -XX:-HeapDumpOnOutOfMemoryError"
-Environment=OPENSEARCH_INITIAL_ADMIN_PASSWORD={{ podman_link_opensearch_password }}
+Environment=OPENSEARCH_INITIAL_ADMIN_PASSWORD={{ podman_link_opensearch_password | replace("%", "%%") }}
 Environment=compatibility.override_main_response_version=true
 Image=registry.gitlab.com/digiresilience/link/link-stack/opensearch:{{ podman_link_stack_version }}
 PublishPort=127.0.0.1:9200:9200
diff --git a/roles/podman_link/templates/home/config/containers/systemd/zammad-postgresql.container b/roles/podman_link/templates/home/config/containers/systemd/zammad-postgresql.container
index 330919b..76f94bc 100644
--- a/roles/podman_link/templates/home/config/containers/systemd/zammad-postgresql.container
+++ b/roles/podman_link/templates/home/config/containers/systemd/zammad-postgresql.container
@@ -3,7 +3,7 @@ PartOf=zammad-storage.target
 
 [Container]
 ContainerName=zammad-postgresql
-Environment=POSTGRES_PASSWORD={{ podman_link_postgres_zammad_password }}
+Environment=POSTGRES_PASSWORD={{ podman_link_postgres_zammad_password | replace("%", "%%") }}
 Environment=POSTGRES_USER={{ podman_link_postgres_zammad_user }}
 Environment=POSTGRES_DB={{ podman_link_postgres_zammad_database }}
 Environment=POSTGRES_HOST_AUTH_METHOD=scram-sha-256
diff --git a/roles/podman_link/templates/home/config/containers/systemd/zammad-redis.container b/roles/podman_link/templates/home/config/containers/systemd/zammad-redis.container
index 00b00c6..576a41d 100644
--- a/roles/podman_link/templates/home/config/containers/systemd/zammad-redis.container
+++ b/roles/podman_link/templates/home/config/containers/systemd/zammad-redis.container
@@ -3,7 +3,7 @@ PartOf=zammad-storage.target
 
 [Container]
 ContainerName=zammad-redis
-Environment=REDIS_PASSWORD={{ podman_link_zammad_redis_password }}
+Environment=REDIS_PASSWORD={{ podman_link_zammad_redis_password | replace("%", "%%") }}
 Image=registry.gitlab.com/digiresilience/link/link-stack/redis:{{ podman_link_stack_version }}
 Volume=/home/{{ podman_link_podman_rootless_user }}/redis-data:/data:rw,Z
 Network=zammad.network