diff --git a/build.gradle b/build.gradle
index 0deb23c..5a2cc62 100644
--- a/build.gradle
+++ b/build.gradle
@@ -166,6 +166,10 @@ dependencies {
 	implementation "${baseGroupId}:adempiere-grpc-utils:1.5.1"
 	// AWS3 Connector to use as File Storagee (https://central.sonatype.com/artifact/io.github.adempiere/adempiere-s3-connector)
 	implementation "${baseGroupId}:adempiere-s3-connector:1.0.4"
+	implementation "${baseGroupId}:adempiere-jwt-token:1.0.3"
+	implementation "io.jsonwebtoken:jjwt-api:0.12.6"
+	implementation "io.jsonwebtoken:jjwt-impl:0.12.6"
+	implementation "io.jsonwebtoken:jjwt-jackson:0.12.6"
 
 	//	Others
 	compileOnly 'org.apache.tomcat:annotations-api:6.0.53'
diff --git a/docker-compose/.env b/docker-compose/.env
index ea1893c..92e870d 100644
--- a/docker-compose/.env
+++ b/docker-compose/.env
@@ -17,7 +17,7 @@ POSTGRES_PASSWORD="adempiere"
 POSTGRES_VOLUME="${STACK_NAME}.volume_postgres"
 
 # Adempiere UI ZK
-ADEMPIERE_ZK_IMAGE="openls/adempiere-zk-ui:jetty-1.1.6"
+ADEMPIERE_ZK_IMAGE="openls/adempiere-zk-ui:jetty-alpine-1.2.0"
 ADEMPIERE_ZK_HOST="${STACK_NAME}.adempiere.zk"
 ADEMPIERE_ZK_INTERNAL_PORT=8080
 ADEMPIERE_ZK_EXTERNAL_PORT=${ADEMPIERE_ZK_INTERNAL_PORT}
@@ -27,7 +27,7 @@ ADEMPIERE_ZK_DB_NAME="adempiere"
 ADEMPIERE_ZK_DB_PASSWORD=${POSTGRES_PASSWORD}
 
 # ADempiere gRPC Template
-GRPC_SERVER_IMAGE="openls/adempiere-report-engine-service:1.1.3"
+GRPC_SERVER_IMAGE="openls/adempiere-report-engine-service:alpine-1.1.3"
 GRPC_SERVER_HOST="${STACK_NAME}.adempiere.grpc.service"
 GRPC_SERVER_INTERNAL_PORT=50059
 GRPC_SERVER_EXTERNAL_PORT=${GRPC_SERVER_INTERNAL_PORT}