diff --git a/linux/epicmorg/prod/jdk11/Makefile b/linux/epicmorg/prod/jdk11/Makefile
index 0e1191be5..82c5a2de6 100644
--- a/linux/epicmorg/prod/jdk11/Makefile
+++ b/linux/epicmorg/prod/jdk11/Makefile
@@ -1,5 +1,5 @@
-all: emgprod
-emgprod:
-	docker build --compress -t epicmorg/prod:jdk11 .
-	docker push epicmorg/prod:jdk11
+all: app
 
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/epicmorg/prod/jdk11/docker-compose.yml b/linux/epicmorg/prod/jdk11/docker-compose.yml
new file mode 100644
index 000000000..f2f42c39a
--- /dev/null
+++ b/linux/epicmorg/prod/jdk11/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/prod:jdk11"
+    build:
+      context: .
diff --git a/linux/epicmorg/prod/jdk6/Makefile b/linux/epicmorg/prod/jdk6/Makefile
index fa42f0e27..82c5a2de6 100644
--- a/linux/epicmorg/prod/jdk6/Makefile
+++ b/linux/epicmorg/prod/jdk6/Makefile
@@ -1,5 +1,5 @@
-all: emgprod
-emgprod:
-	docker build --compress -t epicmorg/prod:jdk6 .
-	docker push epicmorg/prod:jdk6
+all: app
 
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/epicmorg/prod/jdk6/docker-compose.yml b/linux/epicmorg/prod/jdk6/docker-compose.yml
new file mode 100644
index 000000000..d3b32eefa
--- /dev/null
+++ b/linux/epicmorg/prod/jdk6/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/prod:jdk6"
+    build:
+      context: .
diff --git a/linux/epicmorg/prod/jdk7/Makefile b/linux/epicmorg/prod/jdk7/Makefile
index 5288c1ad5..82c5a2de6 100644
--- a/linux/epicmorg/prod/jdk7/Makefile
+++ b/linux/epicmorg/prod/jdk7/Makefile
@@ -1,5 +1,5 @@
-all: emgprod
-emgprod:
-	docker build --compress -t epicmorg/prod:jdk7 .
-	docker push epicmorg/prod:jdk7
+all: app
 
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/epicmorg/prod/jdk7/docker-compose.yml b/linux/epicmorg/prod/jdk7/docker-compose.yml
new file mode 100644
index 000000000..552f80bde
--- /dev/null
+++ b/linux/epicmorg/prod/jdk7/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/prod:jdk7"
+    build:
+      context: .
diff --git a/linux/epicmorg/prod/jdk8/Makefile b/linux/epicmorg/prod/jdk8/Makefile
index 7ee8c155f..82c5a2de6 100644
--- a/linux/epicmorg/prod/jdk8/Makefile
+++ b/linux/epicmorg/prod/jdk8/Makefile
@@ -1,5 +1,5 @@
-all: emgprod
-emgprod:
-	docker build --compress -t epicmorg/prod:jdk8 .
-	docker push epicmorg/prod:jdk8
+all: app
 
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/epicmorg/prod/jdk8/docker-compose.yml b/linux/epicmorg/prod/jdk8/docker-compose.yml
new file mode 100644
index 000000000..e1a271d98
--- /dev/null
+++ b/linux/epicmorg/prod/jdk8/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/prod:jdk8"
+    build:
+      context: .
diff --git a/linux/epicmorg/prod/main/Makefile b/linux/epicmorg/prod/main/Makefile
index 9c6cb3e47..82c5a2de6 100644
--- a/linux/epicmorg/prod/main/Makefile
+++ b/linux/epicmorg/prod/main/Makefile
@@ -1,5 +1,5 @@
-all: emgprod
-emgprod:
-	docker build --compress -t epicmorg/prod .
-	docker push epicmorg/prod
+all: app
 
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/epicmorg/prod/main/docker-compose.yml b/linux/epicmorg/prod/main/docker-compose.yml
new file mode 100644
index 000000000..0eb49ecd4
--- /dev/null
+++ b/linux/epicmorg/prod/main/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/prod:latest"
+    build:
+      context: .