diff --git a/DOCKER_AND_COMPOSE_VERSION_MATRIX b/DOCKER_AND_COMPOSE_VERSION_MATRIX
index 3f99dfd..16ed21d 100644
--- a/DOCKER_AND_COMPOSE_VERSION_MATRIX
+++ b/DOCKER_AND_COMPOSE_VERSION_MATRIX
@@ -1,2 +1,9 @@
 1.12  1.8.*
 1.13  1.10.*
+17    1.18.*
+17.03 1.11.*
+17.06 1.15.*
+17.09 1.16.*
+17.12 1.18.*
+18    1.19.*
+18.02 1.19.*