diff --git a/client-registry-jempi/docker-compose.combined-cluster.yml b/client-registry-jempi/docker-compose.combined-cluster.yml
index f5928fd2..9bb46f17 100644
--- a/client-registry-jempi/docker-compose.combined-cluster.yml
+++ b/client-registry-jempi/docker-compose.combined-cluster.yml
@@ -1,4 +1,4 @@
-version: '3.9'
+version: "3.9"
 
 services:
   jempi-bootstrapper:
diff --git a/client-registry-jempi/docker-compose.combined.yml b/client-registry-jempi/docker-compose.combined.yml
index 7b58f260..89b20bee 100644
--- a/client-registry-jempi/docker-compose.combined.yml
+++ b/client-registry-jempi/docker-compose.combined.yml
@@ -1,4 +1,4 @@
-version: '3.9'
+version: "3.9"
 
 services:
   jempi-async-receiver:
@@ -21,7 +21,6 @@ services:
       default:
       jempi:
 
-
   jempi-etl:
     image: jembi/jempi-etl:${JEMPI_ETL_IMAGE_TAG}
     environment:
@@ -40,7 +39,6 @@ services:
       default:
       jempi:
 
-
   jempi-controller:
     image: jembi/jempi-controller:${JEMPI_CONTROLLER_IMAGE_TAG}
     environment:
@@ -75,7 +73,6 @@ services:
       jempi:
       postgres:
 
-
   jempi-linker:
     image: jembi/jempi-linker:${JEMPI_LINKER_IMAGE_TAG}
     environment:
@@ -111,7 +108,6 @@ services:
       jempi:
       postgres:
 
-
   jempi-bootstrapper:
     image: jembi/jempi-bootstrapper:${JEMPI_BOOTSTRAPPER_IMAGE_TAG}
     environment:
@@ -134,11 +130,9 @@ services:
       jempi:
       postgres:
 
-
 volumes:
   jempi-shared-data:
 
-
 networks:
   kafka:
     name: kafka_public
diff --git a/client-registry-jempi/docker-compose.dgraph-zero-cluster.yml b/client-registry-jempi/docker-compose.dgraph-zero-cluster.yml
index fe7e61f8..bf417002 100644
--- a/client-registry-jempi/docker-compose.dgraph-zero-cluster.yml
+++ b/client-registry-jempi/docker-compose.dgraph-zero-cluster.yml
@@ -1,24 +1,24 @@
-version: '3.9'
+version: "3.9"
 
 services:
   jempi-zero-01:
     deploy:
       placement:
         constraints:
-          - node.labels.name == node-1
+          - node.labels.name == ${JEMPI_ZERO_01_PLACEMENT}
     command: dgraph zero --my=jempi-zero-01:5080 --replicas 3 --bindall --raft "idx=1"
     networks:
       jempi:
 
   jempi-zero-02:
-    image: dgraph/dgraph:v22.0.0
+    image: ${JEMPI_ZERO_IMAGE}
     volumes:
       - jempi-zero-02-data:/dgraph
     deploy:
       replicas: 1
       placement:
         constraints:
-          - node.labels.name == node-2
+          - node.labels.name == ${JEPMI_ZERO_02_PLACEMENT}
       resources:
         limits:
           memory: ${JEMPI_ZERO_MEMORY_LIMIT}
@@ -31,14 +31,14 @@ services:
       jempi:
 
   jempi-zero-03:
-    image: dgraph/dgraph:v22.0.0
+    image: ${JEMPI_ZERO_IMAGE}
     volumes:
       - jempi-zero-03-data:/dgraph
     deploy:
       replicas: 1
       placement:
         constraints:
-          - node.labels.name == node-3
+          - node.labels.name == ${JEMPI_ZERO_03_PLACEMENT}
       resources:
         limits:
           memory: ${JEMPI_ZERO_MEMORY_LIMIT}
diff --git a/client-registry-jempi/docker-compose.dgraph-zero.yml b/client-registry-jempi/docker-compose.dgraph-zero.yml
index 8b8da6d0..abea063e 100644
--- a/client-registry-jempi/docker-compose.dgraph-zero.yml
+++ b/client-registry-jempi/docker-compose.dgraph-zero.yml
@@ -1,8 +1,8 @@
-version: '3.9'
+version: "3.9"
 
 services:
   jempi-zero-01:
-    image: dgraph/dgraph:v22.0.0
+    image: ${JEMPI_ZERO_IMAGE}
     volumes:
       - jempi-zero-01-data:/dgraph
     deploy:
diff --git a/client-registry-jempi/docker-compose.dgraph.yml b/client-registry-jempi/docker-compose.dgraph.yml
index 93ada3f7..2f1c30ce 100644
--- a/client-registry-jempi/docker-compose.dgraph.yml
+++ b/client-registry-jempi/docker-compose.dgraph.yml
@@ -1,8 +1,8 @@
-version: '3.9'
+version: "3.9"
 
 services:
   jempi-alpha-01:
-    image: dgraph/dgraph:v22.0.0
+    image: ${JEMPI_ZERO_IMAGE}
     hostname: alpha-01
     volumes:
       - jempi-alpha-01-data:/dgraph
@@ -20,7 +20,7 @@ services:
       jempi:
 
   jempi-alpha-02:
-    image: dgraph/dgraph:v22.0.0
+    image: ${JEMPI_ZERO_IMAGE}
     hostname: alpha-02
     volumes:
       - jempi-alpha-02-data:/dgraph
@@ -38,7 +38,7 @@ services:
       jempi:
 
   jempi-alpha-03:
-    image: dgraph/dgraph:v22.0.0
+    image: ${JEMPI_ZERO_IMAGE}
     hostname: alpha-03
     volumes:
       - jempi-alpha-03-data:/dgraph
@@ -56,7 +56,7 @@ services:
       jempi:
 
   jempi-ratel:
-    image: dgraph/ratel:v21.03.2
+    image: ${JEMPI_RATEL_IMAGE}
     deploy:
       replicas: 1
       resources:
diff --git a/client-registry-jempi/package-metadata.json b/client-registry-jempi/package-metadata.json
index 4d940d2c..736b24b9 100644
--- a/client-registry-jempi/package-metadata.json
+++ b/client-registry-jempi/package-metadata.json
@@ -12,8 +12,14 @@
   ],
   "environmentVariables": {
     "KAFKA_HOSTS": "kafka-01:9092",
+    "JEMPI_POSTGRESQL_IMAGE": "bitnami/postgresql-repmgr:15.2.0",
+    "JEMPI_ZERO_IMAGE": "dgraph/dgraph:v22.0.0",
+    "JEMPI_RATEL_IMAGE": "dgraph/ratel:v21.03.2",
     "JEMPI_ZERO_MEMORY_LIMIT": "3G",
     "JEMPI_ZERO_MEMORY_RESERVE": "500M",
+    "JEMPI_ZERO_01_PLACEMENT": "node-1",
+    "JEMPI_ZERO_02_PLACEMENT": "node-2",
+    "JEMPI_ZERO_03_PLACEMENT": "node-3",
     "JEMPI_ALPHA_01_MEMORY_LIMIT": "3G",
     "JEMPI_ALPHA_01_MEMORY_RESERVE": "500M",
     "JEMPI_ALPHA_02_MEMORY_LIMIT": "3G",
diff --git a/client-registry-santempi/docker-compose.yml b/client-registry-santempi/docker-compose.yml
index 2344611c..1f047d48 100644
--- a/client-registry-santempi/docker-compose.yml
+++ b/client-registry-santempi/docker-compose.yml
@@ -1,8 +1,8 @@
-version: '3.9'
+version: "3.9"
 
 services:
   santedb-mpi:
-    image: santesuite/santedb-mpi:2.2.3
+    image: ${SANTEMPI_IMAGE}
     networks:
       mpi:
       public:
@@ -27,7 +27,7 @@ services:
       - santedb-data:/santedb
 
   santedb-www:
-    image: santesuite/santedb-www:2.2.1.10
+    image: ${SANTEDB_WWW_IMAGE}
     networks:
       default:
       reverse-proxy:
diff --git a/client-registry-santempi/package-metadata.json b/client-registry-santempi/package-metadata.json
index c9b89b96..b33a6da1 100644
--- a/client-registry-santempi/package-metadata.json
+++ b/client-registry-santempi/package-metadata.json
@@ -7,8 +7,16 @@
   "dependencies": ["database-postgres"],
   "environmentVariables": {
     "SANTEMPI_INSTANCES": "1",
-    "POSTGRESQL_PASSWORD": "instant101",
-    "POSTGRESQL_USERNAME": "postgres",
-    "SANTEMPI_DB_REP_SET": "postgres-1"
+    "SANTE_POSTGRES_PASSWORD": "postgres",
+    "SANTEMPI_POSTGRESQL_PASSWORD": "SanteDB123",
+    "SANTEMPI_POSTGRESQL_USERNAME": "santedb",
+    "SANTEMPI_REPMGR_PRIMARY_HOST": "santempi-psql-1",
+    "SANTEMPI_REPMGR_PARTNER_NODES": "santempi-psql-1",
+    "SANTEMPI_IMAGE": "santesuite/santedb-mpi:2.2.3",
+    "SANTEDB_WWW_IMAGE": "santesuite/santedb-www:2.2.1.10",
+    "SANTEMPI_PSQL_IMAGE": "bitnami/postgresql-repmgr:14",
+    "PSQL_1_PLACEMENT": "node-1",
+    "PSQL_2_PLACEMENT": "node-2",
+    "PSQL_3_PLACEMENT": "node-3"
   }
 }
diff --git a/data-mapper-logstash/docker-compose.yml b/data-mapper-logstash/docker-compose.yml
index dce9ece8..19e93d8b 100644
--- a/data-mapper-logstash/docker-compose.yml
+++ b/data-mapper-logstash/docker-compose.yml
@@ -1,8 +1,8 @@
-version: '3.9'
+version: "3.9"
 
 services:
   data-mapper-logstash:
-    image: docker.elastic.co/logstash/logstash:7.12.1
+    image: ${LOGSTASH_IMAGE}
     healthcheck:
       test: curl --fail http://localhost:9600 || exit 1
       interval: 10s
@@ -19,7 +19,7 @@ services:
       - logstash-data:/usr/share/logstash/data
     deploy:
       placement:
-        max_replicas_per_node: 1
+        max_replicas_per_node: ${LOGSTASH_MAX_REPLICAS_PER_NODE}
       replicas: ${LOGSTASH_INSTANCES}
       resources:
         limits:
diff --git a/data-mapper-logstash/package-metadata.json b/data-mapper-logstash/package-metadata.json
index 5419ea47..285afb05 100644
--- a/data-mapper-logstash/package-metadata.json
+++ b/data-mapper-logstash/package-metadata.json
@@ -6,7 +6,9 @@
   "version": "0.0.1",
   "dependencies": ["analytics-datastore-elastic-search"],
   "environmentVariables": {
+    "LOGSTASH_IMAGE": "docker.elastic.co/logstash/logstash:7.12.1",
     "LOGSTASH_INSTANCES": "1",
+    "LOGSTASH_MAX_REPLICAS_PER_NODE": "1",
     "LS_JAVA_OPTS": "-Xmx2g -Xms2g",
     "LOGSTASH_YML_CONFIG": "logstash-logstash.yml",
     "LOGSTASH_DEV_MOUNT": "false",
diff --git a/database-postgres/docker-compose-postgres.cluster.yml b/database-postgres/docker-compose-postgres.cluster.yml
index b7660c98..5a3ea8f4 100644
--- a/database-postgres/docker-compose-postgres.cluster.yml
+++ b/database-postgres/docker-compose-postgres.cluster.yml
@@ -10,7 +10,7 @@ services:
           - "node.labels.name==${POSTGRES_1_PLACEMENT}"
 
   postgres-2:
-    image: bitnami/postgresql-repmgr:14
+    image: ${POSTGRES_IMAGE}
     environment:
       POSTGRESQL_PASSWORD: ${POSTGRESQL_PASSWORD}
       REPMGR_NODE_NETWORK_NAME: postgres-2
@@ -45,7 +45,7 @@ services:
       postgres:
 
   postgres-3:
-    image: bitnami/postgresql-repmgr:14
+    image: ${POSTGRES_IMAGE}
     environment:
       POSTGRESQL_PASSWORD: ${POSTGRESQL_PASSWORD}
       REPMGR_NODE_NETWORK_NAME: postgres-3
diff --git a/database-postgres/docker-compose-postgres.yml b/database-postgres/docker-compose-postgres.yml
index b5165127..d501dbd4 100644
--- a/database-postgres/docker-compose-postgres.yml
+++ b/database-postgres/docker-compose-postgres.yml
@@ -20,7 +20,7 @@ services:
       - target: /bitnami/postgresql/conf/conf.d/custom_postgresql.conf
         source: postgresql.conf
     deploy:
-      replicas: 1
+      replicas: ${POSTGRES_REPLICAS}
       resources:
         limits:
           cpus: ${POSTGRES_CPU_LIMIT}
diff --git a/database-postgres/package-metadata.json b/database-postgres/package-metadata.json
index c7240670..10beda95 100644
--- a/database-postgres/package-metadata.json
+++ b/database-postgres/package-metadata.json
@@ -35,6 +35,7 @@
     "PGPOOL_MEMORY_RESERVE": "50M",
     "HF_PGPOOL_ENABLED": "true",
     "POSTGRES_FAILOVER": "automatic",
-    "POSTGRES_DEGRADED_MONITORING_TIMEOUT": "5"
+    "POSTGRES_DEGRADED_MONITORING_TIMEOUT": "5",
+    "POSTGRES_REPLICAS": "1"
   }
 }
diff --git a/kafka-mapper-consumer/docker-compose.yml b/kafka-mapper-consumer/docker-compose.yml
index cc031e00..b6f935db 100644
--- a/kafka-mapper-consumer/docker-compose.yml
+++ b/kafka-mapper-consumer/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.9'
+version: "3.9"
 
 services:
   kafka-mapper-consumer:
diff --git a/kafka-unbundler-consumer/docker-compose.yml b/kafka-unbundler-consumer/docker-compose.yml
index a934ff08..ba5eb8cd 100644
--- a/kafka-unbundler-consumer/docker-compose.yml
+++ b/kafka-unbundler-consumer/docker-compose.yml
@@ -1,8 +1,8 @@
-version: '3.9'
+version: "3.9"
 
 services:
   kafka-unbundler-consumer:
-    image: jembi/kafka-unbundler-consumer:0.0.3
+    image: ${KAFKA_UNBUNDLER_CONSUMER_IMAGE}
     environment:
       KAFKA_HOST: ${KAFKA_HOST}
       KAFKA_PORT: ${KAFKA_PORT}
diff --git a/kafka-unbundler-consumer/package-metadata.json b/kafka-unbundler-consumer/package-metadata.json
index 3715632a..d166aee7 100644
--- a/kafka-unbundler-consumer/package-metadata.json
+++ b/kafka-unbundler-consumer/package-metadata.json
@@ -6,6 +6,7 @@
   "version": "0.0.1",
   "dependencies": ["message-bus-kafka"],
   "environmentVariables": {
+    "KAFKA_UNBUNDLER_CONSUMER_IMAGE": "jembi/kafka-unbundler-consumer:0.0.3",
     "KAFKA_HOST": "kafka-01",
     "KAFKA_PORT": "9092"
   }
diff --git a/message-bus-helper-hapi-proxy/docker-compose.yml b/message-bus-helper-hapi-proxy/docker-compose.yml
index 8dc29e46..fe75785f 100644
--- a/message-bus-helper-hapi-proxy/docker-compose.yml
+++ b/message-bus-helper-hapi-proxy/docker-compose.yml
@@ -1,8 +1,8 @@
-version: '3.9'
+version: "3.9"
 
 services:
   hapi-proxy:
-    image: jembi/springproxyserver:20211217-170809.3f57ef5
+    image: ${HAPI_PROXY_IMAGE}
     hostname: hapi-proxy
     environment:
       HAPI_SERVER_URL: ${HAPI_SERVER_URL}
diff --git a/message-bus-helper-hapi-proxy/package-metadata.json b/message-bus-helper-hapi-proxy/package-metadata.json
index 6802cf05..e4862c18 100644
--- a/message-bus-helper-hapi-proxy/package-metadata.json
+++ b/message-bus-helper-hapi-proxy/package-metadata.json
@@ -6,6 +6,7 @@
   "type": "infrastructure",
   "dependencies": ["message-bus-kafka", "fhir-datastore-hapi-fhir"],
   "environmentVariables": {
+    "HAPI_PROXY_IMAGE": "jembi/springproxyserver:20211217-170809.3f57ef5",
     "HAPI_PROXY_INSTANCES": 1,
     "HAPI_PROXY_CPU_LIMIT": "0",
     "HAPI_PROXY_CPU_RESERVE": "0.05",
diff --git a/message-bus-kafka/docker-compose.cluster.kafka.yml b/message-bus-kafka/docker-compose.cluster.kafka.yml
index e6c34f23..506b9fd7 100644
--- a/message-bus-kafka/docker-compose.cluster.kafka.yml
+++ b/message-bus-kafka/docker-compose.cluster.kafka.yml
@@ -1,4 +1,4 @@
-version: '3.9'
+version: "3.9"
 
 services:
   kafka-01:
@@ -7,32 +7,32 @@ services:
     deploy:
       placement:
         constraints:
-          - "node.labels.name==node-1"
+          - "node.labels.name==${KAFKA_01_PLACEMENT}"
 
   kafka-02:
-    image: bitnami/kafka:3.4.0
+    image: ${KAFKA_IMAGE}
     hostname: "{{.Node.Hostname}}-{{.Service.Name}}"
     environment:
       BITNAMI_DEBUG: ${KAFKA_DEBUG}
-      KAFKA_ENABLE_KRAFT: 'yes'
-      KAFKA_KRAFT_CLUSTER_ID: 'ehB92ChxEe2iYQAAAkKsEg'
+      KAFKA_ENABLE_KRAFT: "yes"
+      KAFKA_KRAFT_CLUSTER_ID: "ehB92ChxEe2iYQAAAkKsEg"
       KAFKA_CFG_NODE_ID: 2
       KAFKA_CFG_BROKER_ID: 2
-      KAFKA_CFG_PROCESS_ROLES: 'broker,controller'
+      KAFKA_CFG_PROCESS_ROLES: "broker,controller"
       KAFKA_CFG_CONTROLLER_LISTENER_NAMES: CONTROLLER
       KAFKA_CFG_LISTENERS: PLAINTEXT://:9092,CONTROLLER://:9093
       KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT
       KAFKA_CFG_ADVERTISED_LISTENERS: PLAINTEXT://kafka-02:9092
       KAFKA_CFG_CONTROLLER_QUORUM_VOTERS: 1@kafka-01:9093,2@kafka-02:9093,3@kafka-03:9093
       KAFKA_CFG_INTER_BROKER_LISTENER_NAME: PLAINTEXT
-      ALLOW_PLAINTEXT_LISTENER: 'yes'
+      ALLOW_PLAINTEXT_LISTENER: "yes"
     volumes:
       - kafka-02-data:/bitnami/kafka
     deploy:
       placement:
         constraints:
-          - "node.labels.name==node-2"
-      replicas: 1
+          - "node.labels.name==${KAFKA_02_PLACEMENT}"
+      replicas: ${KAFKA_REPLICAS}
       resources:
         limits:
           memory: ${KAFKA_MEMORY_LIMIT}
@@ -45,29 +45,29 @@ services:
       default:
 
   kafka-03:
-    image: bitnami/kafka:3.4.0
+    image: ${KAFKA_IMAGE}
     hostname: "{{.Node.Hostname}}-{{.Service.Name}}"
     environment:
       BITNAMI_DEBUG: ${KAFKA_DEBUG}
-      KAFKA_ENABLE_KRAFT: 'yes'
-      KAFKA_KRAFT_CLUSTER_ID: 'ehB92ChxEe2iYQAAAkKsEg'
+      KAFKA_ENABLE_KRAFT: "yes"
+      KAFKA_KRAFT_CLUSTER_ID: "ehB92ChxEe2iYQAAAkKsEg"
       KAFKA_CFG_NODE_ID: 3
       KAFKA_CFG_BROKER_ID: 3
-      KAFKA_CFG_PROCESS_ROLES: 'broker,controller'
+      KAFKA_CFG_PROCESS_ROLES: "broker,controller"
       KAFKA_CFG_CONTROLLER_LISTENER_NAMES: CONTROLLER
       KAFKA_CFG_LISTENERS: PLAINTEXT://:9092,CONTROLLER://:9093
       KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT
       KAFKA_CFG_ADVERTISED_LISTENERS: PLAINTEXT://kafka-03:9092
       KAFKA_CFG_CONTROLLER_QUORUM_VOTERS: 1@kafka-01:9093,2@kafka-02:9093,3@kafka-03:9093
       KAFKA_CFG_INTER_BROKER_LISTENER_NAME: PLAINTEXT
-      ALLOW_PLAINTEXT_LISTENER: 'yes'
+      ALLOW_PLAINTEXT_LISTENER: "yes"
     volumes:
-      - kafka-03-data:/bitnami/kafka    
+      - kafka-03-data:/bitnami/kafka
     deploy:
       placement:
         constraints:
-          - "node.labels.name==node-3"
-      replicas: 1
+          - "node.labels.name==${KAFKA_03_PLACEMENT}"
+      replicas: ${KAFKA_REPLICAS}
       resources:
         limits:
           memory: ${KAFKA_MEMORY_LIMIT}
diff --git a/message-bus-kafka/docker-compose.kafka-utils.yml b/message-bus-kafka/docker-compose.kafka-utils.yml
index f9ebf1b3..4720bf31 100644
--- a/message-bus-kafka/docker-compose.kafka-utils.yml
+++ b/message-bus-kafka/docker-compose.kafka-utils.yml
@@ -1,15 +1,15 @@
-version: '3.9'
+version: "3.9"
 
 services:
   kafdrop:
-    image: obsidiandynamics/kafdrop:3.27.0
+    image: ${KAFDROP_IMAGE}
     networks:
       public:
       default:
     environment:
       KAFKA_BROKERCONNECT: ${KAFKA_HOSTS}
-      JVM_OPTS: '-Xms16M -Xmx48M -Xss180K -XX:-TieredCompilation -XX:+UseStringDeduplication -noverify'
-      CMD_ARGS: '--server.port=9013 --management.server.port=9013'
+      JVM_OPTS: "-Xms16M -Xmx48M -Xss180K -XX:-TieredCompilation -XX:+UseStringDeduplication -noverify"
+      CMD_ARGS: "--server.port=9013 --management.server.port=9013"
     deploy:
       resources:
         limits:
@@ -20,7 +20,7 @@ services:
           memory: ${KAFDROP_MEMORY_RESERVE}
 
   kafka-minion:
-    image: quay.io/cloudhut/kminion:master
+    image: ${KAFKA_MINION}
     networks:
       prometheus:
       default:
diff --git a/message-bus-kafka/docker-compose.kafka.yml b/message-bus-kafka/docker-compose.kafka.yml
index 27ea5463..228eb899 100644
--- a/message-bus-kafka/docker-compose.kafka.yml
+++ b/message-bus-kafka/docker-compose.kafka.yml
@@ -1,23 +1,23 @@
-version: '3.9'
+version: "3.9"
 
 services:
   kafka-01:
-    image: bitnami/kafka:3.4.0
+    image: ${KAFKA_IMAGE}
     hostname: "{{.Node.Hostname}}-{{.Service.Name}}"
     environment:
       BITNAMI_DEBUG: ${KAFKA_DEBUG}
-      KAFKA_ENABLE_KRAFT: 'yes'
-      KAFKA_KRAFT_CLUSTER_ID: 'ehB92ChxEe2iYQAAAkKsEg'
+      KAFKA_ENABLE_KRAFT: "yes"
+      KAFKA_KRAFT_CLUSTER_ID: "ehB92ChxEe2iYQAAAkKsEg"
       KAFKA_CFG_NODE_ID: 1
       KAFKA_CFG_BROKER_ID: 1
-      KAFKA_CFG_PROCESS_ROLES: 'broker,controller'
+      KAFKA_CFG_PROCESS_ROLES: "broker,controller"
       KAFKA_CFG_CONTROLLER_LISTENER_NAMES: CONTROLLER
       KAFKA_CFG_LISTENERS: PLAINTEXT://:9092,CONTROLLER://:9093
       KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT
       KAFKA_CFG_ADVERTISED_LISTENERS: PLAINTEXT://kafka-01:9092
       KAFKA_CFG_CONTROLLER_QUORUM_VOTERS: 1@kafka-01:9093
       KAFKA_CFG_INTER_BROKER_LISTENER_NAME: PLAINTEXT
-      ALLOW_PLAINTEXT_LISTENER: 'yes'
+      ALLOW_PLAINTEXT_LISTENER: "yes"
     volumes:
       - kafka-01-data:/bitnami/kafka
     deploy:
@@ -33,11 +33,9 @@ services:
       public:
       default:
 
-
 volumes:
   kafka-01-data:
 
-
 networks:
   public:
     name: kafka_public
diff --git a/message-bus-kafka/package-metadata.json b/message-bus-kafka/package-metadata.json
index 17e7b106..6934efb3 100644
--- a/message-bus-kafka/package-metadata.json
+++ b/message-bus-kafka/package-metadata.json
@@ -6,6 +6,13 @@
   "type": "infrastructure",
   "dependencies": [],
   "environmentVariables": {
+    "KAFKA_IMAGE": "bitnami/kafka:3.4.0",
+    "KAFDROP_IMAGE": "obsidiandynamics/kafdrop:3.27.0",
+    "KAFKA_MINION": "quay.io/cloudhut/kminion:master",
+    "KAFKA_01_PLACEMENT": "node-1",
+    "KAFKA_02_PLACEMENT": "node-2",
+    "KAFKA_03_PLACEMENT": "node-3",
+    "KAFKA_REPLICAS": "1",
     "KAFKA_HOSTS": "kafka-01:9092",
     "KAFKA_CPU_LIMIT": "0",
     "KAFKA_CPU_RESERVE": "0.05",
diff --git a/mpi-mediator/docker-compose.yml b/mpi-mediator/docker-compose.yml
index 9497ecf8..747b208a 100644
--- a/mpi-mediator/docker-compose.yml
+++ b/mpi-mediator/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.9'
+version: "3.9"
 
 services:
   mpi-mediator:
@@ -36,7 +36,7 @@ services:
       PATIENT_PROFILE_FOR_STUB_PATIENT: ${PATIENT_PROFILE_FOR_STUB_PATIENT}
     deploy:
       placement:
-        max_replicas_per_node: 1
+        max_replicas_per_node: ${MPI_MEDIATOR_MAX_REPLICAS_PER_NODE}
       replicas: ${MPI_MEDIATOR_INSTANCES}
 
 networks:
diff --git a/mpi-mediator/importer/docker-compose.config.yml b/mpi-mediator/importer/docker-compose.config.yml
index 6cb8ed9c..b8ae5e6e 100644
--- a/mpi-mediator/importer/docker-compose.config.yml
+++ b/mpi-mediator/importer/docker-compose.config.yml
@@ -1,9 +1,9 @@
-version: '3.9'
+version: "3.9"
 
 services:
   # container for executing config import scripts for creating the OpenHIM channels used by the Mediator
   mpi-mediator-config-importer:
-    image: node:erbium-alpine
+    image: ${MPI_MEDIATOR_CONFIG_IMPORTER_IMAGE}
     networks:
       openhim:
       default:
@@ -19,7 +19,7 @@ services:
       - source: mpi-mediator-config-importer-openhim-import.json
         target: /openhim-import.json
     deploy:
-      replicas: 1
+      replicas: ${MPI_MEDIATOR_CONFIG_IMPORTER_REPLICAS}
       restart_policy:
         condition: none
 
diff --git a/mpi-mediator/package-metadata.json b/mpi-mediator/package-metadata.json
index ce30f0a9..2dbe68b6 100644
--- a/mpi-mediator/package-metadata.json
+++ b/mpi-mediator/package-metadata.json
@@ -6,6 +6,10 @@
   "version": "0.0.1",
   "dependencies": ["fhir-datastore-hapi-fhir", "client-registry-jempi"],
   "environmentVariables": {
+    "MPI_MEDIATOR_CONFIG_IMPORTER_IMAGE": "node:erbium-alpine",
+    "MPI_MEDIATOR_CONFIG_IMPORTER_REPLICAS": 1,
+    "MPI_MEDIATOR_IMAGE": "jembi/mpi-mediator:v2.3.0",
+    "MPI_MEDIATOR_MAX_REPLICAS_PER_NODE": 1,
     "MPI_MEDIATOR_INSTANCES": 1,
     "MPI_MEDIATOR_VERSION": "v2.3.0",
     "OPENHIM_MEDIATOR_URL": "https://openhim-core:8080",