diff --git a/win32/epicmorg/prod/win-server-core/Makefile b/win32/epicmorg/prod/win-server-core/Makefile
index 3e46b7059..82c5a2de6 100644
--- a/win32/epicmorg/prod/win-server-core/Makefile
+++ b/win32/epicmorg/prod/win-server-core/Makefile
@@ -1,5 +1,5 @@
-all: emgprod
-emgprod:
-	docker build --compress -t epicmorg/prod:win-server-core .
-	docker push epicmorg/prod:win-server-core
+all: app
 
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/win32/epicmorg/prod/win-server-core/docker-compose.yml b/win32/epicmorg/prod/win-server-core/docker-compose.yml
new file mode 100644
index 000000000..7be0cca18
--- /dev/null
+++ b/win32/epicmorg/prod/win-server-core/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/prod:win-server-core"
+    build:
+      context: .
diff --git a/win32/epicmorg/prod/win10/Makefile b/win32/epicmorg/prod/win10/Makefile
index 090a3f7de..82c5a2de6 100644
--- a/win32/epicmorg/prod/win10/Makefile
+++ b/win32/epicmorg/prod/win10/Makefile
@@ -1,5 +1,5 @@
-all: emgprod
-emgprod:
-	docker build --compress -t epicmorg/prod:win10 .
-	docker push epicmorg/prod:win10
+all: app
 
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/win32/epicmorg/prod/win10/docker-compose.yml b/win32/epicmorg/prod/win10/docker-compose.yml
new file mode 100644
index 000000000..847250482
--- /dev/null
+++ b/win32/epicmorg/prod/win10/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/prod:win10"
+    build:
+      context: .