diff --git a/Makefile b/Makefile
index 5a0d347f62..133f74b056 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,7 @@
 #!make
 include config.env
-.PHONY: clean-pyc clean-build
 
-DOCKER_MYSQL_IMAGE = mysql:8.0
-DOCKER_ORACLE_IMAGE = wnameless/oracle-xe-11g
-DOCKER_POSTGRES_IMAGE = postgres:9.6-alpine
-DOCKER_REDIS_IMAGE = redis:5.0-alpine
+.PHONY: clean-pyc clean-build
 
 help:
 	@echo "Usage: make <target>\n"
diff --git a/config.env b/config.env
index a2e3f42415..267bacb490 100644
--- a/config.env
+++ b/config.env
@@ -1,5 +1,5 @@
 DOCKER_MYSQL_IMAGE_VERSION=mysql:8.0
-DOCKER_ORACLE_IMAGE=wnameless/oracle-xe-11g
+DOCKER_ORACLE_IMAGE_VERSION=wnameless/oracle-xe-11g
 DOCKER_POSTGRES_IMAGE_VERSION=postgres:9.6-alpine
 DOCKER_RABBITMQ_IMAGE_VERSION=rabbitmq:3
 DOCKER_REDIS_IMAGE_VERSION=redis:5.0-alpine