diff --git a/linux/websites/latest/Dockerfile b/linux/apache2/latest/Dockerfile
similarity index 100%
rename from linux/websites/latest/Dockerfile
rename to linux/apache2/latest/Dockerfile
diff --git a/linux/apache2/latest/Makefile b/linux/apache2/latest/Makefile
new file mode 100644
index 000000000..508d4cc37
--- /dev/null
+++ b/linux/apache2/latest/Makefile
@@ -0,0 +1,5 @@
+all: apache2
+apache2:
+	docker build --compress -t epicmorg/apache2:latest .
+	docker push  epicmorg/apache2:latest
+	docker push  epicmorg/websites:latest
diff --git a/linux/websites/latest/README.md b/linux/apache2/latest/README.md
similarity index 100%
rename from linux/websites/latest/README.md
rename to linux/apache2/latest/README.md
diff --git a/linux/websites/latest/run.sh b/linux/apache2/latest/run.sh
similarity index 100%
rename from linux/websites/latest/run.sh
rename to linux/apache2/latest/run.sh
diff --git a/linux/websites/php7.2/Dockerfile b/linux/apache2/php7.2/Dockerfile
similarity index 100%
rename from linux/websites/php7.2/Dockerfile
rename to linux/apache2/php7.2/Dockerfile
diff --git a/linux/apache2/php7.2/Makefile b/linux/apache2/php7.2/Makefile
new file mode 100644
index 000000000..6b4390392
--- /dev/null
+++ b/linux/apache2/php7.2/Makefile
@@ -0,0 +1,5 @@
+all: apache2
+apache2:
+	docker build --compress -t epicmorg/apache2:php7.2 .
+	docker push epicmorg/apache2:php7.2
+	docker push epicmorg/websites:php7.2
diff --git a/linux/websites/php7.2/README.md b/linux/apache2/php7.2/README.md
similarity index 100%
rename from linux/websites/php7.2/README.md
rename to linux/apache2/php7.2/README.md
diff --git a/linux/websites/php7.2/run.sh b/linux/apache2/php7.2/run.sh
similarity index 100%
rename from linux/websites/php7.2/run.sh
rename to linux/apache2/php7.2/run.sh
diff --git a/linux/websites/php7.3/Dockerfile b/linux/apache2/php7.3/Dockerfile
similarity index 100%
rename from linux/websites/php7.3/Dockerfile
rename to linux/apache2/php7.3/Dockerfile
diff --git a/linux/apache2/php7.3/Makefile b/linux/apache2/php7.3/Makefile
new file mode 100644
index 000000000..af7d3d660
--- /dev/null
+++ b/linux/apache2/php7.3/Makefile
@@ -0,0 +1,5 @@
+all: apache2
+apache2:
+	docker build --compress -t epicmorg/apache2:php7.3 .
+	docker push epicmorg/apache2:php7.3
+	docker push epicmorg/websites:php7.3
diff --git a/linux/websites/php7.3/README.md b/linux/apache2/php7.3/README.md
similarity index 100%
rename from linux/websites/php7.3/README.md
rename to linux/apache2/php7.3/README.md
diff --git a/linux/websites/php7.3/run.sh b/linux/apache2/php7.3/run.sh
similarity index 100%
rename from linux/websites/php7.3/run.sh
rename to linux/apache2/php7.3/run.sh
diff --git a/linux/websites/php7.4/Dockerfile b/linux/apache2/php7.4/Dockerfile
similarity index 100%
rename from linux/websites/php7.4/Dockerfile
rename to linux/apache2/php7.4/Dockerfile
diff --git a/linux/apache2/php7.4/Makefile b/linux/apache2/php7.4/Makefile
new file mode 100644
index 000000000..febb205fa
--- /dev/null
+++ b/linux/apache2/php7.4/Makefile
@@ -0,0 +1,5 @@
+all: apache2
+apache2:
+	docker build --compress -t epicmorg/apache2:php7.4 .
+	docker push  epicmorg/apache2:php7.4
+	docker push  epicmorg/websites:php7.4
diff --git a/linux/websites/php7.4/README.md b/linux/apache2/php7.4/README.md
similarity index 100%
rename from linux/websites/php7.4/README.md
rename to linux/apache2/php7.4/README.md
diff --git a/linux/websites/php7.4/run.sh b/linux/apache2/php7.4/run.sh
similarity index 100%
rename from linux/websites/php7.4/run.sh
rename to linux/apache2/php7.4/run.sh
diff --git a/linux/websites/latest/Makefile b/linux/websites/latest/Makefile
deleted file mode 100644
index 87bc7ce7c..000000000
--- a/linux/websites/latest/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: php
-php:
-	docker build --compress -t epicmorg/websites:latest .
-	docker push  epicmorg/websites:latest
diff --git a/linux/websites/php7.2/Makefile b/linux/websites/php7.2/Makefile
deleted file mode 100644
index a15fcdd63..000000000
--- a/linux/websites/php7.2/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: php
-php:
-	docker build --compress -t epicmorg/websites:php7.2 .
-	docker push epicmorg/websites:php7.2
diff --git a/linux/websites/php7.3/Makefile b/linux/websites/php7.3/Makefile
deleted file mode 100644
index ca36d57f7..000000000
--- a/linux/websites/php7.3/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: php
-php:
-	docker build --compress -t epicmorg/websites:php7.3 .
-	docker push epicmorg/websites:php7.3
diff --git a/linux/websites/php7.4/Makefile b/linux/websites/php7.4/Makefile
deleted file mode 100644
index d664649be..000000000
--- a/linux/websites/php7.4/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: php
-php:
-	docker build --compress -t epicmorg/websites:php7.4 .
-	docker push  epicmorg/websites:php7.4