diff --git a/docker-compose-virtuoso.yml b/docker-compose-virtuoso.yml
index fece5c7b14..e3c6261d83 100644
--- a/docker-compose-virtuoso.yml
+++ b/docker-compose-virtuoso.yml
@@ -22,6 +22,7 @@ services:
       NO_ENTRYPOINT_WORKERS: 1
     env_file:
       - docker/db.env
+      - docker/virtuoso.env
     volumes:
       - seek-filestore:/seek/filestore
       - seek-cache:/seek/tmp/cache
@@ -46,10 +47,9 @@ services:
       RAILS_ENV: production
       SOLR_PORT: 8983
       SOLR_HOST: solr
-      DBA_PASSWORD: wibble
-      VIRTUOSO: 'true'
     env_file:
       - docker/db.env
+      - docker/virtuoso.env
     volumes:
       - seek-filestore:/seek/filestore
       - seek-cache:/seek/tmp/cache
@@ -77,14 +77,14 @@ services:
       - /opt/solr/server/solr/configsets/seek_config 
 
   virtuoso:
-    image: openlink/virtuoso-opensource-7
+    image: openlink/virtuoso-opensource-7:7.2.15
     container_name: seek-virtuoso
     restart: always
     ports:
       - "8890:8890"
       - "1111:1111"
     environment:
-      DBA_PASSWORD: wibble
+      DBA_PASSWORD: CHANGE_ME
     volumes:
       - seek-virtuoso-data:/database
 
diff --git a/docker/virtuoso.env b/docker/virtuoso.env
new file mode 100644
index 0000000000..bcb7d88432
--- /dev/null
+++ b/docker/virtuoso.env
@@ -0,0 +1,4 @@
+DBA_PASSWORD=CHANGE_ME
+RDF_PUBLIC_GRAPH=seek:public
+#RDF_PRIVATE_GRAPH=seek:private
+VIRTUOSO=true
\ No newline at end of file
diff --git a/docker/virtuoso_settings.docker.yml b/docker/virtuoso_settings.docker.yml
index b149399cdb..d8a4a3d3f7 100644
--- a/docker/virtuoso_settings.docker.yml
+++ b/docker/virtuoso_settings.docker.yml
@@ -5,7 +5,7 @@ production:
   username: dba
   password: <%= ENV["DBA_PASSWORD"] %>
 
-  private_graph: seek:private
-  public_graph: seek:public
+  private_graph: <%= ENV["RDF_PRIVATE_GRAPH"] %>
+  public_graph: <%= ENV["RDF_PUBLIC_GRAPH"] %>
 
   disabled: <%= !ENV["VIRTUOSO"].present? %>
\ No newline at end of file