diff --git a/linux/apache2/latest/Makefile b/linux/apache2/latest/Makefile
index 8bedaeb82..82c5a2de6 100644
--- a/linux/apache2/latest/Makefile
+++ b/linux/apache2/latest/Makefile
@@ -1,4 +1,5 @@
-all: apache2
-apache2:
-	docker build --compress -t epicmorg/apache2:latest .
-	docker push  epicmorg/apache2:latest
+all: app
+
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/apache2/latest/docker-compose.yml b/linux/apache2/latest/docker-compose.yml
new file mode 100644
index 000000000..99eebbfd1
--- /dev/null
+++ b/linux/apache2/latest/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/apache2:latest"
+    build:
+      context: .
diff --git a/linux/apache2/php7.2/Makefile b/linux/apache2/php7.2/Makefile
index 49e2ea0dc..82c5a2de6 100644
--- a/linux/apache2/php7.2/Makefile
+++ b/linux/apache2/php7.2/Makefile
@@ -1,4 +1,5 @@
-all: apache2
-apache2:
-	docker build --compress -t epicmorg/apache2:php7.2 .
-	docker push epicmorg/apache2:php7.2
+all: app
+
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/apache2/php7.2/docker-compose.yml b/linux/apache2/php7.2/docker-compose.yml
new file mode 100644
index 000000000..332da33ab
--- /dev/null
+++ b/linux/apache2/php7.2/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/apache2:php7.2"
+    build:
+      context: .
diff --git a/linux/apache2/php7.3/Makefile b/linux/apache2/php7.3/Makefile
index dac5e2861..82c5a2de6 100644
--- a/linux/apache2/php7.3/Makefile
+++ b/linux/apache2/php7.3/Makefile
@@ -1,4 +1,5 @@
-all: apache2
-apache2:
-	docker build --compress -t epicmorg/apache2:php7.3 .
-	docker push epicmorg/apache2:php7.3
+all: app
+
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/apache2/php7.3/docker-compose.yml b/linux/apache2/php7.3/docker-compose.yml
new file mode 100644
index 000000000..5b1f13f1f
--- /dev/null
+++ b/linux/apache2/php7.3/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/apache2:php7.3"
+    build:
+      context: .
diff --git a/linux/apache2/php7.4/Makefile b/linux/apache2/php7.4/Makefile
index 6b382fa7a..82c5a2de6 100644
--- a/linux/apache2/php7.4/Makefile
+++ b/linux/apache2/php7.4/Makefile
@@ -1,4 +1,5 @@
-all: apache2
-apache2:
-	docker build --compress -t epicmorg/apache2:php7.4 .
-	docker push  epicmorg/apache2:php7.4
+all: app
+
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/apache2/php7.4/docker-compose.yml b/linux/apache2/php7.4/docker-compose.yml
new file mode 100644
index 000000000..e6723b69c
--- /dev/null
+++ b/linux/apache2/php7.4/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/apache2:php7.4"
+    build:
+      context: .