diff --git a/compose/sample-apps.yml b/compose/sample-apps.yml
index e47c2ca7a..c99c4598d 100644
--- a/compose/sample-apps.yml
+++ b/compose/sample-apps.yml
@@ -17,7 +17,7 @@ services:
       CRYOSTAT_AGENT_CALLBACK: "http://sample-app-1:8910/"
       CRYOSTAT_AGENT_BASEURI: "http://${CRYOSTAT_HTTP_HOST}:8080/"
       CRYOSTAT_AGENT_TRUST_ALL: "true"
-      CRYOSTAT_AGENT_AUTHORIZATION: Basic dXNlcjpwYXNz
+      CRYOSTAT_AGENT_AUTHORIZATION: Basic dXNlcjpwYXNz # "Basic $(echo -n user:pass | base64)"
     ports:
       - "8081:8081"
     expose:
@@ -51,7 +51,7 @@ services:
       CRYOSTAT_AGENT_CALLBACK: "http://sample-app-2:8911/"
       CRYOSTAT_AGENT_BASEURI: "http://${CRYOSTAT_HTTP_HOST}:8080/"
       CRYOSTAT_AGENT_TRUST_ALL: "true"
-      CRYOSTAT_AGENT_AUTHORIZATION: "Basic dXNlcjpwYXNz"
+      CRYOSTAT_AGENT_AUTHORIZATION: Basic dXNlcjpwYXNz # "Basic $(echo -n user:pass | base64)"
     ports:
       - "8082:8082"
     expose:
@@ -82,7 +82,7 @@ services:
       CRYOSTAT_AGENT_CALLBACK: "http://sample-app-3:8912/"
       CRYOSTAT_AGENT_BASEURI: "http://${CRYOSTAT_HTTP_HOST}:8080/"
       CRYOSTAT_AGENT_TRUST_ALL: "true"
-      CRYOSTAT_AGENT_AUTHORIZATION: "Basic dXNlcjpwYXNz"
+      CRYOSTAT_AGENT_AUTHORIZATION: Basic dXNlcjpwYXNz # "Basic $(echo -n user:pass | base64)"
     ports:
       - "8083:8083"
     expose:
@@ -125,7 +125,8 @@ services:
       CRYOSTAT_AGENT_BASEURI_RANGE: public
       CRYOSTAT_AGENT_SSL_TRUST_ALL: "true"
       CRYOSTAT_AGENT_SSL_VERIFY_HOSTNAME: "false"
-      CRYOSTAT_AGENT_AUTHORIZATION: Basic dXNlcjpwYXNz # "Basic $(echo -n user:pass | base64)"
+      CRYOSTAT_AGENT_AUTHORIZATION_TYPE: basic
+      CRYOSTAT_AGENT_AUTHORIZATION_VALUE: user:pass
       CRYOSTAT_AGENT_HARVESTER_PERIOD_MS: 30000
       CRYOSTAT_AGENT_HARVESTER_MAX_FILES: 3
       CRYOSTAT_AGENT_HARVESTER_EXIT_MAX_AGE_MS: 60000