diff --git a/fhir-datastore-hapi-fhir/Dockerfile b/fhir-datastore-hapi-fhir/Dockerfile
index 0399fa1d..c5b3e7bc 100644
--- a/fhir-datastore-hapi-fhir/Dockerfile
+++ b/fhir-datastore-hapi-fhir/Dockerfile
@@ -1,4 +1,4 @@
-FROM hapiproject/hapi:v6.10.1
+FROM hapiproject/hapi:v7.0.3
 
 # Copy the static shell into base image
 COPY --from=busybox:1.36.0-uclibc /bin/sh /bin/sh
diff --git a/fhir-datastore-hapi-fhir/docker-compose.yml b/fhir-datastore-hapi-fhir/docker-compose.yml
index fed04b75..27f7f74f 100644
--- a/fhir-datastore-hapi-fhir/docker-compose.yml
+++ b/fhir-datastore-hapi-fhir/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.9'
+version: "3.9"
 
 services:
   hapi-fhir:
@@ -12,7 +12,7 @@ services:
       - spring.datasource.username=${HF_POSTGRESQL_USERNAME}
       - spring.datasource.password=${HF_POSTGRESQL_PASSWORD}
       - spring.datasource.driverClassName=org.postgresql.Driver
-      - spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect
+      - spring.jpa.properties.hibernate.dialect=ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgres94Dialect
       - spring.datasource.hikari.maximumPoolSize=${HF_MAX_POOL_SIZE}
       - spring.datasource.hikari.minimumIdle=20
       - spring.datasource.hikari.connectionTimeout=60000
@@ -37,7 +37,7 @@ services:
           cpus: ${HAPI_FHIR_CPU_RESERVE}
           memory: ${HAPI_FHIR_MEMORY_RESERVE}
     healthcheck:
-      test: /bin/wget --no-verbose --tries=1 --spider http://localhost:8080/fhir/Organization?identifier=urn:healthcheck
+      test: /bin/wget --no-verbose --tries=1 --spider http://localhost:8080/actuator/health
       interval: 30s
       timeout: 5s
       retries: 5
diff --git a/fhir-datastore-hapi-fhir/package-metadata.json b/fhir-datastore-hapi-fhir/package-metadata.json
index 241b141a..397704fd 100644
--- a/fhir-datastore-hapi-fhir/package-metadata.json
+++ b/fhir-datastore-hapi-fhir/package-metadata.json
@@ -34,7 +34,7 @@
     "HF_PGPOOL_CPU_RESERVE": "0.05",
     "HF_PGPOOL_MEMORY_RESERVE": "50M",
     "HF_JAVA_OPTS": "-Xmx2g",
-    "HF_IMAGE_TAG": "v6.10.1-wget",
+    "HF_IMAGE_TAG": "v7.0.3-wget",
     "HF_MAX_POOL_SIZE": "80",
     "HF_PGPOOL_ENABLED": "true",
     "HF_POSTGRES_FAILOVER": "automatic",
diff --git a/interoperability-layer-openhim/docker-compose.yml b/interoperability-layer-openhim/docker-compose.yml
index 2a2073f3..8fd88c41 100644
--- a/interoperability-layer-openhim/docker-compose.yml
+++ b/interoperability-layer-openhim/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.9'
+version: "3.9"
 
 services:
   openhim-core:
@@ -39,7 +39,7 @@ services:
         - prometheus-port=8080
 
   openhim-console:
-    image: jembi/openhim-console:v1.19.0
+    image: ${OPENHIM_CONSOLE_VERSION}
     environment:
       OPENHIM_CORE_MEDIATOR_HOSTNAME: ${OPENHIM_CORE_MEDIATOR_HOSTNAME}
       OPENHIM_MEDIATOR_API_PORT: ${OPENHIM_MEDIATOR_API_PORT}
diff --git a/interoperability-layer-openhim/package-metadata.json b/interoperability-layer-openhim/package-metadata.json
index 3158f12f..0d01c755 100644
--- a/interoperability-layer-openhim/package-metadata.json
+++ b/interoperability-layer-openhim/package-metadata.json
@@ -26,6 +26,7 @@
     "OPENHIM_MONGO_MEMORY_RESERVE": "500M",
     "OPENHIM_MONGO_URL": "mongodb://mongo-1:27017/openhim",
     "OPENHIM_MONGO_ATNAURL": "mongodb://mongo-1:27017/openhim",
+    "OPENHIM_CONSOLE_VERSION": "jembi/openhim-console:v1.18.2",
     "KAFKA_HOSTS": "kafka-01:9092",
     "KC_REALM_NAME": "platform-realm",
     "KC_FRONTEND_URL": "http://localhost:9088",