diff --git a/Makefile b/Makefile
index f9dcedd..f897e81 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,9 @@
 #!make
+
+# if [ ! -d "custom" ]; then echo "You need to copy custom.sample to custom folder and adapt." && exit 1; fi
+# if [ ! -f "digitaldemocratic.conf" ]; then echo "You need to copy digitaldemocratic.conf.sample to .sample to custom folder and adapt" && exit 1; fi
+#  folder and adapt before bringing up." && exit 1; fi
+
 include digitaldemocratic.conf
 export $(shell sed 's/=.*//' digitaldemocratic.conf)
 
@@ -10,16 +15,13 @@ CUSTOM_PATH=$(shell pwd)
 .PHONY: environment
 environment:
 	git submodule update --init --recursive
-	#cp custom/menu/* isard-sso/docker/api/src/
-	#cp custom/img/* isard-sso/docker/api/src/api/static/img/
-	#cp custom/login/logo.png isard-sso/docker/keycloak/themes/liiibrelite/login/resources/img/logo.png
-	#cp custom/login/background.png isard-sso/docker/keycloak/themes/liiibrelite/login/resources/img/loginBG.png
-	#cp custom/login/style.css isard-sso/docker/keycloak/themes/liiibrelite/login/resources/css/
 	mkdir -p custom/system/keycloak
 	cp -R isard-sso/docker/keycloak/themes custom/system/keycloak/
 	cp custom/login/logo.png custom/system/keycloak/themes/liiibrelite/login/resources/img/logo.png
 	cp custom/login/background.png custom/system/keycloak/themes/liiibrelite/login/resources/img/loginBG.png
 	cp custom/login/style.css custom/system/keycloak/themes/liiibrelite/login/resources/css/
+
+	# Prepare apps environment
 	cp digitaldemocratic.conf isard-apps/.env
 	echo "CUSTOM_PATH=$(CUSTOM_PATH)" >> isard-apps/.env
 	echo "BUILD_ROOT_PATH=$(CUSTOM_PATH)/isard-apps" >> isard-apps/.env
@@ -30,17 +32,17 @@ environment:
 	cp isard-apps/.env isard-apps/docker/wordpress && \
 	cp isard-apps/.env isard-apps/docker/etherpad
 
-	#cp digitaldemocratic.conf isard-sso/docker-compose-parts/.env
-	echo "CUSTOM_PATH=$(CUSTOM_PATH)" >> isard-sso/docker-compose-parts/.env
-	echo "BUILD_ROOT_PATH=$(CUSTOM_PATH)/isard-sso" >> isard-sso/docker-compose-parts/.env
+	# Prepare sso environment
+	cp digitaldemocratic.conf isard-sso/.env
+	echo "CUSTOM_PATH=$(CUSTOM_PATH)" >> isard-sso/.env
+	echo "BUILD_ROOT_PATH=$(CUSTOM_PATH)/isard-sso" >> isard-sso/.env
+	cp isard-sso/.env isard-sso/docker-compose-parts/.env
 
-	#cp digitaldemocratic.conf docker-compose-parts/.env
-	#echo "BUILD_ROOT_PATH=$(CUSTOM_PATH)" >> docker-compose-parts/.env
 
 .PHONY: build
 build: environment
-	echo CUSTOM_PATH=$(CUSTOM_PATH) > .env
-	echo BUILD_ROOT_PATH=$(CUSTOM_PATH)/isard-sso >> .env
+	# echo CUSTOM_PATH=$(CUSTOM_PATH) > .env
+	# echo BUILD_ROOT_PATH=$(CUSTOM_PATH)/isard-sso >> .env
 	docker-compose 	-f isard-sso/docker-compose-parts/haproxy.yml \
 					-f isard-sso/docker-compose-parts/api.yml \
 					-f isard-sso/docker-compose-parts/keycloak.yml \
diff --git a/isard-sso b/isard-sso
index 757beff..6a0e2f1 160000
--- a/isard-sso
+++ b/isard-sso
@@ -1 +1 @@
-Subproject commit 757beff4e2fbbc9d2af88ae83fc27d2ae16c8dcb
+Subproject commit 6a0e2f145a1a5c5fdc67fda912be23676e8b5fa4