diff --git a/1.12.1/open/php7.1/apache/Dockerfile b/1.12.1/open/php7.1/apache/Dockerfile
index 56c216b..8a61f23 100644
--- a/1.12.1/open/php7.1/apache/Dockerfile
+++ b/1.12.1/open/php7.1/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.1-apache-stretch
+FROM php:7.1-apache-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.12.1/open/php7.1/fpm/Dockerfile b/1.12.1/open/php7.1/fpm/Dockerfile
index 424df6e..6d0030b 100644
--- a/1.12.1/open/php7.1/fpm/Dockerfile
+++ b/1.12.1/open/php7.1/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.1-fpm-stretch
+FROM php:7.1-fpm-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.12.1/open/php7.2/apache/Dockerfile b/1.12.1/open/php7.2/apache/Dockerfile
index 36690a6..0b1c191 100644
--- a/1.12.1/open/php7.2/apache/Dockerfile
+++ b/1.12.1/open/php7.2/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.2-apache-stretch
+FROM php:7.2-apache-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.12.1/open/php7.2/fpm/Dockerfile b/1.12.1/open/php7.2/fpm/Dockerfile
index c4fb764..1fe7d4f 100644
--- a/1.12.1/open/php7.2/fpm/Dockerfile
+++ b/1.12.1/open/php7.2/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.2-fpm-stretch
+FROM php:7.2-fpm-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.12.1/pro/php7.1/apache/Dockerfile b/1.12.1/pro/php7.1/apache/Dockerfile
index a4a8f78..1e0e92d 100644
--- a/1.12.1/pro/php7.1/apache/Dockerfile
+++ b/1.12.1/pro/php7.1/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.1-apache-stretch
+FROM php:7.1-apache-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.12.1/pro/php7.1/fpm/Dockerfile b/1.12.1/pro/php7.1/fpm/Dockerfile
index dd4f499..1631cb6 100644
--- a/1.12.1/pro/php7.1/fpm/Dockerfile
+++ b/1.12.1/pro/php7.1/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.1-fpm-stretch
+FROM php:7.1-fpm-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.12.1/pro/php7.2/apache/Dockerfile b/1.12.1/pro/php7.2/apache/Dockerfile
index 3b38ffb..8e5bf1d 100644
--- a/1.12.1/pro/php7.2/apache/Dockerfile
+++ b/1.12.1/pro/php7.2/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.2-apache-stretch
+FROM php:7.2-apache-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.12.1/pro/php7.2/fpm/Dockerfile b/1.12.1/pro/php7.2/fpm/Dockerfile
index ff4c816..4288790 100644
--- a/1.12.1/pro/php7.2/fpm/Dockerfile
+++ b/1.12.1/pro/php7.2/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.2-fpm-stretch
+FROM php:7.2-fpm-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.12.4/open/php7.1/apache/Dockerfile b/1.12.4/open/php7.1/apache/Dockerfile
index e7f891e..76eadb7 100644
--- a/1.12.4/open/php7.1/apache/Dockerfile
+++ b/1.12.4/open/php7.1/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.1-apache-stretch
+FROM php:7.1-apache-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.12.4/open/php7.1/fpm/Dockerfile b/1.12.4/open/php7.1/fpm/Dockerfile
index f95d5b2..7a6b767 100644
--- a/1.12.4/open/php7.1/fpm/Dockerfile
+++ b/1.12.4/open/php7.1/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.1-fpm-stretch
+FROM php:7.1-fpm-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.12.4/open/php7.2/apache/Dockerfile b/1.12.4/open/php7.2/apache/Dockerfile
index f4c59ea..d77e66b 100644
--- a/1.12.4/open/php7.2/apache/Dockerfile
+++ b/1.12.4/open/php7.2/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.2-apache-stretch
+FROM php:7.2-apache-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.12.4/open/php7.2/fpm/Dockerfile b/1.12.4/open/php7.2/fpm/Dockerfile
index 9b7e135..0a5672a 100644
--- a/1.12.4/open/php7.2/fpm/Dockerfile
+++ b/1.12.4/open/php7.2/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.2-fpm-stretch
+FROM php:7.2-fpm-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.12.4/pro/php7.1/apache/Dockerfile b/1.12.4/pro/php7.1/apache/Dockerfile
index 34d40b4..a557c4a 100644
--- a/1.12.4/pro/php7.1/apache/Dockerfile
+++ b/1.12.4/pro/php7.1/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.1-apache-stretch
+FROM php:7.1-apache-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.12.4/pro/php7.1/fpm/Dockerfile b/1.12.4/pro/php7.1/fpm/Dockerfile
index 191d7df..9d0c37e 100644
--- a/1.12.4/pro/php7.1/fpm/Dockerfile
+++ b/1.12.4/pro/php7.1/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.1-fpm-stretch
+FROM php:7.1-fpm-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.12.4/pro/php7.2/apache/Dockerfile b/1.12.4/pro/php7.2/apache/Dockerfile
index a64e9d7..57207c4 100644
--- a/1.12.4/pro/php7.2/apache/Dockerfile
+++ b/1.12.4/pro/php7.2/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.2-apache-stretch
+FROM php:7.2-apache-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.12.4/pro/php7.2/fpm/Dockerfile b/1.12.4/pro/php7.2/fpm/Dockerfile
index d4459fe..8d8f6a2 100644
--- a/1.12.4/pro/php7.2/fpm/Dockerfile
+++ b/1.12.4/pro/php7.2/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.2-fpm-stretch
+FROM php:7.2-fpm-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.13/open/php7.1/apache/Dockerfile b/1.13/open/php7.1/apache/Dockerfile
index e2a972f..d483afa 100644
--- a/1.13/open/php7.1/apache/Dockerfile
+++ b/1.13/open/php7.1/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.1-apache-stretch
+FROM php:7.1-apache-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.13/open/php7.1/fpm/Dockerfile b/1.13/open/php7.1/fpm/Dockerfile
index 7ad447d..da88130 100644
--- a/1.13/open/php7.1/fpm/Dockerfile
+++ b/1.13/open/php7.1/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.1-fpm-stretch
+FROM php:7.1-fpm-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.13/open/php7.2/apache/Dockerfile b/1.13/open/php7.2/apache/Dockerfile
index 731ba45..8381747 100644
--- a/1.13/open/php7.2/apache/Dockerfile
+++ b/1.13/open/php7.2/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.2-apache-stretch
+FROM php:7.2-apache-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.13/open/php7.2/fpm/Dockerfile b/1.13/open/php7.2/fpm/Dockerfile
index 74b9f2b..1dd5270 100644
--- a/1.13/open/php7.2/fpm/Dockerfile
+++ b/1.13/open/php7.2/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.2-fpm-stretch
+FROM php:7.2-fpm-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.13/open/php7.3/apache/Dockerfile b/1.13/open/php7.3/apache/Dockerfile
index a17a5f0..b3bcb82 100644
--- a/1.13/open/php7.3/apache/Dockerfile
+++ b/1.13/open/php7.3/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.3-apache-stretch
+FROM php:7.3-apache-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.13/open/php7.3/fpm/Dockerfile b/1.13/open/php7.3/fpm/Dockerfile
index b0ae880..5a4013c 100644
--- a/1.13/open/php7.3/fpm/Dockerfile
+++ b/1.13/open/php7.3/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.3-fpm-stretch
+FROM php:7.3-fpm-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.13/open/php7.4/apache/Dockerfile b/1.13/open/php7.4/apache/Dockerfile
index ce56c40..e38fe78 100644
--- a/1.13/open/php7.4/apache/Dockerfile
+++ b/1.13/open/php7.4/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-rc-apache-stretch
+FROM php:7.4-rc-apache-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.13/open/php7.4/fpm/Dockerfile b/1.13/open/php7.4/fpm/Dockerfile
index 740b962..bc055ba 100644
--- a/1.13/open/php7.4/fpm/Dockerfile
+++ b/1.13/open/php7.4/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-rc-fpm-stretch
+FROM php:7.4-rc-fpm-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.13/pro/php7.1/apache/Dockerfile b/1.13/pro/php7.1/apache/Dockerfile
index 64f9cf1..71b2a4c 100644
--- a/1.13/pro/php7.1/apache/Dockerfile
+++ b/1.13/pro/php7.1/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.1-apache-stretch
+FROM php:7.1-apache-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.13/pro/php7.1/fpm/Dockerfile b/1.13/pro/php7.1/fpm/Dockerfile
index e9837b8..b3006a2 100644
--- a/1.13/pro/php7.1/fpm/Dockerfile
+++ b/1.13/pro/php7.1/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.1-fpm-stretch
+FROM php:7.1-fpm-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.13/pro/php7.2/apache/Dockerfile b/1.13/pro/php7.2/apache/Dockerfile
index 53cfd08..622c485 100644
--- a/1.13/pro/php7.2/apache/Dockerfile
+++ b/1.13/pro/php7.2/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.2-apache-stretch
+FROM php:7.2-apache-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.13/pro/php7.2/fpm/Dockerfile b/1.13/pro/php7.2/fpm/Dockerfile
index 1102747..04a6d7a 100644
--- a/1.13/pro/php7.2/fpm/Dockerfile
+++ b/1.13/pro/php7.2/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.2-fpm-stretch
+FROM php:7.2-fpm-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.13/pro/php7.3/apache/Dockerfile b/1.13/pro/php7.3/apache/Dockerfile
index 599b03b..5e57c1b 100644
--- a/1.13/pro/php7.3/apache/Dockerfile
+++ b/1.13/pro/php7.3/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.3-apache-stretch
+FROM php:7.3-apache-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.13/pro/php7.3/fpm/Dockerfile b/1.13/pro/php7.3/fpm/Dockerfile
index 21f231c..da9e5a8 100644
--- a/1.13/pro/php7.3/fpm/Dockerfile
+++ b/1.13/pro/php7.3/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.3-fpm-stretch
+FROM php:7.3-fpm-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.13/pro/php7.4/apache/Dockerfile b/1.13/pro/php7.4/apache/Dockerfile
index 27f99dd..fb09d3a 100644
--- a/1.13/pro/php7.4/apache/Dockerfile
+++ b/1.13/pro/php7.4/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-rc-apache-stretch
+FROM php:7.4-rc-apache-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/1.13/pro/php7.4/fpm/Dockerfile b/1.13/pro/php7.4/fpm/Dockerfile
index d1596ec..22ca897 100644
--- a/1.13/pro/php7.4/fpm/Dockerfile
+++ b/1.13/pro/php7.4/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-rc-fpm-stretch
+FROM php:7.4-rc-fpm-buster
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/docker.sh b/docker.sh
index 6f09f91..31a7759 100755
--- a/docker.sh
+++ b/docker.sh
@@ -64,14 +64,14 @@ function buildImages {
 }
 
 function pullImages {
-    pullImage php:7.4-rc-fpm-stretch
-    pullImage php:7.4-rc-apache-stretch
-    pullImage php:7.3-fpm-stretch
-    pullImage php:7.3-apache-stretch
-    pullImage php:7.2-fpm-stretch
-    pullImage php:7.2-apache-stretch
-    pullImage php:7.1-fpm-stretch
-    pullImage php:7.1-apache-stretch
+    pullImage php:7.4-rc-fpm-buster
+    pullImage php:7.4-rc-apache-buster
+    pullImage php:7.3-fpm-buster
+    pullImage php:7.3-apache-buster
+    pullImage php:7.2-fpm-buster
+    pullImage php:7.2-apache-buster
+    pullImage php:7.1-fpm-buster
+    pullImage php:7.1-apache-buster
     pullImage php:7.0-fpm-stretch
     pullImage php:7.0-apache-stretch
 }