diff --git a/linux/epicmorg/devel/jdk11/Makefile b/linux/epicmorg/devel/jdk11/Makefile
index 62e0280e0..82c5a2de6 100644
--- a/linux/epicmorg/devel/jdk11/Makefile
+++ b/linux/epicmorg/devel/jdk11/Makefile
@@ -1,5 +1,5 @@
-all: emgdev
-emgdev:
-	docker build --compress -t epicmorg/devel:jdk11 .
-	docker push epicmorg/devel:jdk11
+all: app
 
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/epicmorg/devel/jdk11/docker-compose.yml b/linux/epicmorg/devel/jdk11/docker-compose.yml
new file mode 100644
index 000000000..c18b88c24
--- /dev/null
+++ b/linux/epicmorg/devel/jdk11/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/devel:jdk11"
+    build:
+      context: .
diff --git a/linux/epicmorg/devel/jdk6/Makefile b/linux/epicmorg/devel/jdk6/Makefile
index 6c683ad45..82c5a2de6 100644
--- a/linux/epicmorg/devel/jdk6/Makefile
+++ b/linux/epicmorg/devel/jdk6/Makefile
@@ -1,5 +1,5 @@
-all: emgprod
-emgprod:
-	docker build --compress -t epicmorg/devel:jdk6 .
-	docker push epicmorg/devel:jdk6
+all: app
 
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/epicmorg/devel/jdk6/docker-compose.yml b/linux/epicmorg/devel/jdk6/docker-compose.yml
new file mode 100644
index 000000000..fc8255dba
--- /dev/null
+++ b/linux/epicmorg/devel/jdk6/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/devel:jdk6"
+    build:
+      context: .
diff --git a/linux/epicmorg/devel/jdk7/Makefile b/linux/epicmorg/devel/jdk7/Makefile
index 227771561..82c5a2de6 100644
--- a/linux/epicmorg/devel/jdk7/Makefile
+++ b/linux/epicmorg/devel/jdk7/Makefile
@@ -1,5 +1,5 @@
-all: emgprod
-emgprod:
-	docker build --compress -t epicmorg/devel:jdk7 .
-	docker push epicmorg/devel:jdk7
+all: app
 
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/epicmorg/devel/jdk7/docker-compose.yml b/linux/epicmorg/devel/jdk7/docker-compose.yml
new file mode 100644
index 000000000..05c7ad05f
--- /dev/null
+++ b/linux/epicmorg/devel/jdk7/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/devel:jdk7"
+    build:
+      context: .
diff --git a/linux/epicmorg/devel/jdk8/Makefile b/linux/epicmorg/devel/jdk8/Makefile
index 17f27ca0e..82c5a2de6 100644
--- a/linux/epicmorg/devel/jdk8/Makefile
+++ b/linux/epicmorg/devel/jdk8/Makefile
@@ -1,5 +1,5 @@
-all: emgdev
-emgdev:
-	docker build --compress -t epicmorg/devel:jdk8 .
-	docker push epicmorg/devel:jdk8
+all: app
 
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/epicmorg/devel/jdk8/docker-compose.yml b/linux/epicmorg/devel/jdk8/docker-compose.yml
new file mode 100644
index 000000000..82658b37b
--- /dev/null
+++ b/linux/epicmorg/devel/jdk8/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/devel:jdk8"
+    build:
+      context: .
diff --git a/linux/epicmorg/devel/main/Makefile b/linux/epicmorg/devel/main/Makefile
index e40fa6bff..82c5a2de6 100644
--- a/linux/epicmorg/devel/main/Makefile
+++ b/linux/epicmorg/devel/main/Makefile
@@ -1,5 +1,5 @@
-all: emgdev
-emgdev:
-	docker build --compress -t epicmorg/devel .
-	docker push epicmorg/devel
+all: app
 
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/epicmorg/devel/main/docker-compose.yml b/linux/epicmorg/devel/main/docker-compose.yml
new file mode 100644
index 000000000..d580e7a5d
--- /dev/null
+++ b/linux/epicmorg/devel/main/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/devel:latest"
+    build:
+      context: .