diff --git a/Dockerfile.virtuoso b/Dockerfile.virtuoso
new file mode 100644
index 0000000..77054ff
--- /dev/null
+++ b/Dockerfile.virtuoso
@@ -0,0 +1,3 @@
+FROM tenforce/virtuoso:virtuoso7.2.5
+
+RUN apt-get update && apt-get install -y --no-install-recommends curl && rm -rf /var/lib/apt/lists/*
diff --git a/docker-compose.yml b/docker-compose.yml
index 8de2f6d..9c48ca8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,15 +1,8 @@
-version: '3.2'
-
 services:
-    autoheal: 
-        restart: always
-        image: willfarrell/autoheal
-        environment: 
-            - AUTOHEAL_CONTAINER_LABEL=all
-        volumes:
-            - /var/run/docker.sock:/var/run/docker.sock
     virtuoso:
-        image: tenforce/virtuoso:virtuoso7.2.5
+        build:
+            context: .
+            dockerfile: Dockerfile.virtuoso
         environment:
             - VIRT_SPARQL_MaxQueryCostEstimationTime=default
             - VIRT_SPARQL_MaxQueryExecutionTime=300
@@ -19,24 +12,18 @@ services:
             - type: volume
               source: virtuoso-db1
               target: /data
-        ports:
-            - "8890:8890"
-        restart: always  
-        labels:
-            - "autoheal=true"
-    synbiohubFrontend:
-        image: synbiohub/sbh3frontend:snapshot
-        ports:
-            - "3333:3333"
-        dns: 8.8.8.8
         restart: always
-        environment: 
-            - backend=http://localhost:7777
-            - backendSS=http://synbiohub:7777
+        healthcheck:
+            test: ["CMD-SHELL", "curl -f http://localhost:8890/sparql"]
+            interval: 15s
+            timeout: 10s
+            retries: 4
+    
     synbiohub:
         image: synbiohub/synbiohub:1.6.1-standalone
-        depends_on: 
-            - virtuoso
+        depends_on:
+            virtuoso:
+                condition: service_healthy
         ports:
             - "7777:7777"
         volumes:
@@ -46,10 +33,13 @@ services:
             - type: volume
               source: virtuoso-db1
               target: /virtuoso
-        dns: 8.8.8.8
         restart: always
 
+    synbiohubFrontend:
+        image: synbiohub/sbh3frontend:snapshot
+        ports:
+            - "3333:3333"
+        restart: always
 volumes:
     virtuoso-db1:
     sbh1:
-