diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml
index 54f8d45880fd7ae8fd1d78a9b041cf0e612d803a..a2bccd5fcf1be55a39cbdbba2fe3f2a27e9eb124 100644
--- a/group_vars/all/main.yml
+++ b/group_vars/all/main.yml
@@ -1,6 +1,6 @@
 ---
 
-dslproxy: "arne-centos2.cert-labs.uninett.no"
+dslproxy: "<CHANGE_ME:hostname>"
 
 # TheHive Button plugin
 THEHIVE_URL: "https://hive.gn4-3-wp8-soc.sunet.se/"
diff --git a/roles/build/files/haproxy-entrypoint.sh b/roles/build/files/haproxy-entrypoint.sh
deleted file mode 100755
index 8b2093b08f191f946b8630942d55e18e8f0d2582..0000000000000000000000000000000000000000
--- a/roles/build/files/haproxy-entrypoint.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-set -e
-
-# first arg is `-f` or `--some-option`
-if [ "${1#-}" != "$1" ]; then
-	set -- haproxy "$@"
-fi
-
-if [ "$1" = 'haproxy' ]; then
-	shift # "haproxy"
-	# if the user wants "haproxy", let's add a couple useful flags
-	#   -W  -- "master-worker mode" (similar to the old "haproxy-systemd-wrapper"; allows for reload via "SIGUSR2")
-	#   -db -- disables background mode
-	set -- haproxy -W -db "$@"
-fi
-
-exec "$@"
diff --git a/roles/haproxy/templates/haproxy.cfg.j2 b/roles/haproxy/templates/haproxy.cfg.j2
index 9583375fc1cb52b10f9957e53a54fd03ce321724..ad7771013a8df7e0232be23466d34ea74f70f0ce 100644
--- a/roles/haproxy/templates/haproxy.cfg.j2
+++ b/roles/haproxy/templates/haproxy.cfg.j2
@@ -36,14 +36,14 @@ listen nifiserv
 {% endfor %}
 
 listen odfeserv
-        bind *:9200
+        bind *:9200 ssl crt /etc/ssl/haproxy alpn h2,http/1.1
         mode http
         maxconn 5000
         fullconn 5000
         balance source
         option tcpka
 {% for odfehost in groups['odfeescontainers'] %}
-     	server {{odfehost}} {{odfehost}}:9200 check
+     	server {{odfehost}} {{odfehost}}:9200 ssl check verify none
 {% endfor %}
 	
 listen keycloakserv
diff --git a/roles/nifi/templates/users.xml.j2 b/roles/nifi/templates/users.xml.j2
index 92adb5da1f91db8b4bc0d618766c40dc39f9ea6d..a57969859498c5610ab26a83ae05e53ca093d264 100644
--- a/roles/nifi/templates/users.xml.j2
+++ b/roles/nifi/templates/users.xml.j2
@@ -17,7 +17,7 @@
         <user identifier="c78caf19-016f-1000-0001-{{'%012d'|format(loop.index) }}" identity="CN={{ nifi }}"/>
         {% endfor %}
 	{% for user in soctools_users %}
-        <user identifier="c78caf19-016f-1000-0002-{{'%012d'|format(loop.index) }}" identity="{{ user.DN }}"/>
+        <user identifier="c78caf19-016f-1000-0002-{{'%012d'|format(loop.index) }}" identity="{{ user.username }}"/>
         {% endfor %}        
     </users>
 </tenants>