diff --git a/docker-compose/.env b/docker-compose/.env
index de1f54725ceedea52e8dd6ded8849327627cf7bf..c1956e315f8cde0d48b4b5279807025bede69261 100644
--- a/docker-compose/.env
+++ b/docker-compose/.env
@@ -13,3 +13,8 @@ TANGO_JAVA_VERSION=9.3.6
 TANGO_POGO_VERSION=9.6.34
 TANGO_REST_VERSION=1.14.6
 TANGO_STARTER_VERSION=2021-05-28
+
+PG_SUPERUSER_PASSWORD=password
+PG_HDB_PASSWORD=hdbpp
+MYSQL_ROOT_PASSWORD=secret
+MYSQL_PASSWORD=tango
diff --git a/docker-compose/archiver-timescale.yml b/docker-compose/archiver-timescale.yml
index 8b7c78263f658ee2bd3d2a25ee9ad681550d6d84..056016b55e4098bc6d3fd0c3fa27607ebacf0d2c 100644
--- a/docker-compose/archiver-timescale.yml
+++ b/docker-compose/archiver-timescale.yml
@@ -13,7 +13,8 @@ services:
     depends_on:
       - databaseds
     environment:
-      - POSTGRES_PASSWORD=password
+      - POSTGRES_PASSWORD=${PG_SUPERUSER_PASSWORD}
+      - PG_HDB_PASSWORD=${PG_HDB_PASSWORD}
       - TANGO_HOST=${TANGO_HOST}
     logging:
       driver: syslog
diff --git a/docker-compose/archiver.yml b/docker-compose/archiver.yml
index e0d5583a5924639127615d1ec85aa57ac44569b5..f1f2a1ec65dd4259b99e675c43cb7500862049f4 100644
--- a/docker-compose/archiver.yml
+++ b/docker-compose/archiver.yml
@@ -11,11 +11,11 @@ services:
     depends_on:
       - databaseds
     environment:
-      - MYSQL_ROOT_PASSWORD=secret
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
       - MYSQL_DATABASE=hdbpp
       - MYSQL_HOST=archiver-maria-db:3306
       - MYSQL_USER=tango
-      - MYSQL_PASSWORD=tango
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
       - TANGO_HOST=${TANGO_HOST}
     logging:
       driver: syslog
diff --git a/docker-compose/timescaledb/Dockerfile b/docker-compose/timescaledb/Dockerfile
index 5a8ecde23c3d69b9b665ac28dea3d5d7d5714ffd..86e7a820c3fc4e4ba0eaa8edaa9c7e421c87231f 100644
--- a/docker-compose/timescaledb/Dockerfile
+++ b/docker-compose/timescaledb/Dockerfile
@@ -1,7 +1,7 @@
 FROM timescale/timescaledb:latest-pg12
 
 
-COPY resources/01_admin.sql docker-entrypoint-initdb.d/002_admin.sql
+COPY resources/01_admin.sh docker-entrypoint-initdb.d/002_admin.sh
 COPY resources/02_hdb_schema.sql docker-entrypoint-initdb.d/003_hdb_schema.sql
 COPY resources/03_hdb_roles.sql docker-entrypoint-initdb.d/004_hdb_roles.sql
 COPY resources/04_hdb_ext_aggregates.sql docker-entrypoint-initdb.d/005_hdb_ext_aggregates.sql
diff --git a/docker-compose/timescaledb/resources/01_admin.sql b/docker-compose/timescaledb/resources/01_admin.sh
similarity index 50%
rename from docker-compose/timescaledb/resources/01_admin.sql
rename to docker-compose/timescaledb/resources/01_admin.sh
index 51848f45f786225fe226bf21be024599b73534eb..5cf506b30d9a992e47520b98ae23aa8a41dc98a3 100644
--- a/docker-compose/timescaledb/resources/01_admin.sql
+++ b/docker-compose/timescaledb/resources/01_admin.sh
@@ -1,4 +1,8 @@
-CREATE ROLE hdb_admin WITH LOGIN PASSWORD 'hdbpp';
+#!/bin/bash
+
+psql << EOF
+CREATE ROLE hdb_admin WITH LOGIN PASSWORD '${PG_HDB_PASSWORD}';
 ALTER USER hdb_admin CREATEDB;
 ALTER USER hdb_admin CREATEROLE;
 ALTER USER hdb_admin SUPERUSER;
+EOF