diff --git a/docker-compose/.env b/docker-compose/.env
index eb952e41424380f649d797ec6f2fa6c8879f961c..ac4d6ab6d890f3403624d953bee3fc816bbd8b79 100644
--- a/docker-compose/.env
+++ b/docker-compose/.env
@@ -15,6 +15,7 @@ TANGO_POGO_VERSION=9.6.34
 TANGO_REST_VERSION=1.14.6
 TANGO_STARTER_VERSION=2021-05-28
 
+PG_TIMESCALEDB_VERSION=latest-pg12
 PG_SUPERUSER_PASSWORD=password
 PG_HDB_PASSWORD=hdbpp
 MYSQL_ROOT_PASSWORD=secret
diff --git a/docker-compose/archiver-timescale.yml b/docker-compose/archiver-timescale.yml
index e88a00eb48efa1a9008bd6cb4945887213aba3ec..820142abfbc1b5ad2ff3b87e0829e523749d80ce 100644
--- a/docker-compose/archiver-timescale.yml
+++ b/docker-compose/archiver-timescale.yml
@@ -8,6 +8,8 @@ services:
     image: timescaledb
     build:
         context: timescaledb
+        args: 
+            SOURCE_IMAGE: timescale/timescaledb:${PG_TIMESCALEDB_VERSION}
     container_name: ${CONTAINER_NAME_PREFIX}archiver-timescale
     networks:
       - control
diff --git a/docker-compose/timescaledb/Dockerfile b/docker-compose/timescaledb/Dockerfile
index 656d2ef661a13a5e84eadf7eda2ff6b27684d23c..73932cadd73c5bc0f2ac6d4b0d72d98bcb979d25 100644
--- a/docker-compose/timescaledb/Dockerfile
+++ b/docker-compose/timescaledb/Dockerfile
@@ -1,4 +1,5 @@
-FROM timescale/timescaledb:latest-pg12
+ARG SOURCE_IMAGE
+FROM ${SOURCE_IMAGE}
 
 # Set admin role to perform DB creation
 COPY resources/01_admin.sh docker-entrypoint-initdb.d/002_admin.sh