diff --git a/deploy.yml b/deploy.yml
new file mode 100644
index 0000000..742562f
--- /dev/null
+++ b/deploy.yml
@@ -0,0 +1,27 @@
+version: '3.8'
+
+services:
+  wagtail:
+    ports:
+      - 8000:80
+    depends_on:
+      - db
+    environment:
+      OV_DB_HOST: db
+    env_file:
+      - ov_wag/.env
+    volumes:
+      - ./ov_wag:/app
+  front:
+    volumes:
+      - ./ov-frontend:/var/app
+    ports:
+      - 3000:3000
+  db:
+    env_file:
+      - ov_wag/.db
+    volumes:
+      - ./ov_wag/db:/var/lib/postgresql/data
+  wagtail-tests:
+    volumes:
+      - ./ov_wag:/app
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..0bdc23f
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,25 @@
+version: '3.8'
+
+services:
+  wagtail:
+    image: ov
+    build:
+      context: ./ov_wag
+      target: production
+
+  wagtail-tests:
+    image: ov-tests
+    build:
+      context: ./ov_wag
+      target: base
+
+  front:
+    image: ov-front
+    build:
+      context: ./ov-frontend
+      target: production
+    environment:
+      OV_API_URL: http://wagtail
+
+  db:
+    image: postgres:14.2-alpine
diff --git a/front.yml b/front.yml
deleted file mode 100644
index a4a5c12..0000000
--- a/front.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-version: '3.8'
-
-services:
-  front:
-    build:
-      context: ./ov-frontend
-      target: production
-    image: ov-front
-    environment:
-      OV_API_URL: http://wagtail
-    volumes:
-      - ./ov-frontend:/app
-    ports:
-      - 3000:3000
diff --git a/ov b/ov
index 7a16c89..9494b96 100755
--- a/ov
+++ b/ov
@@ -21,9 +21,8 @@ COMMANDS:\n\n
 OV_UID=$(id -u)
 OV_GID=$(id -g)
 
-COMPOSE="docker compose -f ov_wag/docker-compose.yml"
-DEV="-f ov_wag/dev.yml"
-FRONTEND="-f front.yml"
+COMPOSE="docker compose -f docker-compose.yml -f ov_wag/docker-compose.yml"
+DEPLOY="-f deploy.yml"
 MANAGE="run wagtail python3 manage.py"
 
 if [ -z $1 ]; then
@@ -31,17 +30,17 @@ if [ -z $1 ]; then
 
 elif [ $1 = "build" -o $1 = "b" ]; then
   shift
-  $COMPOSE $DEV $FRONTEND build "$@"
+  docker compose build "$@"
 
 elif [ $1 = "cmd" -o $1 = "c" ]; then
   shift
   # docker run -it -v $(pwd)/:/app/ ov "$@"
-  $COMPOSE $DEV "$@"
+  $COMPOSE $DEPLOY "$@"
 
 elif [ $1 = "dev" -o $1 = "d" ]; then
   shift
   # docker run -itp 8000:8000 -v $(pwd)/:/app/ ov "$@"
-  $COMPOSE $DEV $FRONTEND up
+  $COMPOSE $DEPLOY up
 
 elif [ $1 = "init" -o $1 = "i" ]; then
   shift
@@ -57,22 +56,22 @@ elif [ $1 = "init" -o $1 = "i" ]; then
 elif [ $1 = "manage" -o $1 = "m" ]; then
   shift
   # docker run -it -v $(pwd)/:/app/ ov python3 manage.py "$@"
-  $COMPOSE $DEV $MANAGE "$@"
+  $COMPOSE $DEPLOY $MANAGE "$@"
 
 elif [ $1 = "shell" -o $1 = "s" ]; then
   shift
   # docker run -it -v $(pwd)/:/app/ ov python3 manage.py shell "$@"
-  $COMPOSE $DEV $MANAGE shell "$@"
+  $COMPOSE $DEPLOY $MANAGE shell "$@"
 
 elif [ $1 = "dump" -o $1 = "backup" ]; then
   shift
   TIMESTAMP=`date +%Y-%m-%d_%H-%M-%S`
-  $COMPOSE $DEV exec -it db pg_dump -Fc -U postgres postgres > db_$TIMESTAMP.sql
+  $COMPOSE $DEPLOY exec -it db pg_dump -Fc -U postgres postgres > db_$TIMESTAMP.sql
 
 elif [ $1 = "load" -o $1 = "restore" ]; then
   shift
   # Restore a database from a dump file $1
-  $COMPOSE $DEV exec -iT db pg_restore --verbose --clean --no-acl --no-owner -U postgres -d postgres < $1
+  $COMPOSE $DEPLOY exec -iT db pg_restore --verbose --clean --no-acl --no-owner -U postgres -d postgres < $1
 
 else echo -e $HELP
 
diff --git a/ov_wag b/ov_wag
index 2db4ab7..efe5942 160000
--- a/ov_wag
+++ b/ov_wag
@@ -1 +1 @@
-Subproject commit 2db4ab781884a2dfa43496bb9476a8a865661969
+Subproject commit efe5942a998994bb01d812325f25f9dea551000a