diff --git a/base/docker-compose.yaml b/base/docker-compose.yaml
index 3a2205c..0e1fe6d 100644
--- a/base/docker-compose.yaml
+++ b/base/docker-compose.yaml
@@ -58,6 +58,17 @@ services:
         aliases:
           - fhir-internal
 
+  fhir-smoketest:
+    image: ghcr.io/uwcirg/fhir-summary-smoketest:${FHIR_SMOKETEST_IMAGE_TAG:-latest}
+    depends_on:
+      fhir:
+        condition: service_healthy
+        restart: true
+    environment:
+      FHIR_BASE_URL: http://fhir-internal:8080/fhir
+    networks:
+      - internal
+
   keycloak:
     # use tini as init
     init: true
diff --git a/dev/default.env b/dev/default.env
index 7d12ae9..762df0a 100644
--- a/dev/default.env
+++ b/dev/default.env
@@ -19,6 +19,7 @@ COMPOSE_PROJECT_NAME=
 #SHL_CREATOR_IMAGE_TAG=
 #SHL_SERVER_IMAGE_TAG=
 #PROXY_IMAGE_TAG=
+#FHIR_SMOKETEST_IMAGE_TAG=
 
 # docker-compose development overrides; uncomment to enable
 # COMPOSE_FILE=docker-compose.yaml:docker-compose.dev.shl-creator.yaml
diff --git a/dev/docker-compose.yaml b/dev/docker-compose.yaml
index 34c0621..fd6073c 100644
--- a/dev/docker-compose.yaml
+++ b/dev/docker-compose.yaml
@@ -36,6 +36,11 @@ services:
     env_file:
       keycloak.env
 
+  fhir-smoketest:
+    extends:
+      file: ../base/docker-compose.yaml
+      service: fhir-smoketest
+
   fhir-auth:
     extends:
       file: ../base/docker-compose.yaml
diff --git a/prod/default.env b/prod/default.env
index 5e987db..b7e19cc 100644
--- a/prod/default.env
+++ b/prod/default.env
@@ -19,3 +19,4 @@ COMPOSE_PROJECT_NAME=
 #SHL_CREATOR_IMAGE_TAG=
 #SHL_SERVER_IMAGE_TAG=
 #PROXY_IMAGE_TAG=
+#FHIR_SMOKETEST_IMAGE_TAG=
diff --git a/prod/docker-compose.yaml b/prod/docker-compose.yaml
index 2c136ca..0df90eb 100644
--- a/prod/docker-compose.yaml
+++ b/prod/docker-compose.yaml
@@ -23,6 +23,11 @@ services:
     env_file:
       fhir-auth.env
 
+  fhir-smoketest:
+    extends:
+      file: ../base/docker-compose.yaml
+      service: fhir-smoketest
+
   shl-creator:
     extends:
       file: ../base/docker-compose.yaml