diff --git a/Makefile b/Makefile
index d38d7e444f..6083c7a9c6 100644
--- a/Makefile
+++ b/Makefile
@@ -590,12 +590,12 @@ docker-compose-build: awx-devel-build
 
 # Base development image build
 awx-devel-build:
-	docker build -t ansible/awx_devel -f tools/docker-compose/Dockerfile .
+	docker build -t ansible/awx_devel -f tools/docker-compose/Dockerfile --cache-from=$(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG) .
 	docker tag ansible/awx_devel $(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG)
 	#docker push $(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG)
 
 # For use when developing on "isolated" AWX deployments
-awx-isolated-build:
+awx-isolated-build: awx-devel-build
 	docker build -t ansible/awx_isolated -f tools/docker-isolated/Dockerfile .
 	docker tag ansible/awx_isolated $(DEV_DOCKER_TAG_BASE)/awx_isolated:$(COMPOSE_TAG)
 	#docker push $(DEV_DOCKER_TAG_BASE)/awx_isolated:$(COMPOSE_TAG)
diff --git a/awx/settings/development.py b/awx/settings/development.py
index 9de69b1d07..82fc26f46b 100644
--- a/awx/settings/development.py
+++ b/awx/settings/development.py
@@ -83,6 +83,7 @@ AWX_PROOT_ENABLED = True
 
 AWX_ISOLATED_USERNAME = 'root'
 AWX_ISOLATED_CHECK_INTERVAL = 1
+AWX_ISOLATED_PERIODIC_CHECK = 30
 AWX_ISOLATED_LAUNCH_TIMEOUT = 30
 
 # Disable Pendo on the UI for development/test.
diff --git a/tools/docker-isolated/Dockerfile b/tools/docker-isolated/Dockerfile
index f99076b671..e3d78b732d 100644
--- a/tools/docker-isolated/Dockerfile
+++ b/tools/docker-isolated/Dockerfile
@@ -1,23 +1,9 @@
-FROM centos:7
-RUN yum clean all
+ARG TAG=latest
+FROM ansible/awx_devel:${TAG}
 
-ADD Makefile /tmp/Makefile
-RUN mkdir /tmp/requirements
-ADD requirements/requirements_ansible.txt requirements/requirements_ansible_git.txt requirements/requirements_ansible_uninstall.txt /tmp/requirements/
-RUN yum -y update && yum -y install curl epel-release
-RUN yum -y update && yum -y install openssh-server ansible mg vim tmux git python-devel python36 python36-devel python-psycopg2 make python-psutil libxml2-devel libxslt-devel libstdc++.so.6 gcc cyrus-sasl-devel cyrus-sasl openldap-devel libffi-devel zeromq-devel python-pip xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 xmlsec1-openssl-devel libtool-ltdl-devel bubblewrap zanata-python-client gettext gcc-c++ libcurl-devel python-pycurl bzip2
-
-RUN python3 -m ensurepip
-RUN pip3 install virtualenv
-RUN pip3 install ansible-runner
-WORKDIR /tmp
-RUN make requirements_ansible
-RUN localedef -c -i en_US -f UTF-8 en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-WORKDIR /
-EXPOSE 22
+RUN yum install -y gcc python36-devel
+RUN python3 -m ensurepip && pip3 install virtualenv ansible-runner
+RUN yum remove -y gcc python36-devel && rm -rf /var/cache/yum
 
 RUN rm -f /etc/ssh/ssh_host_ecdsa_key /etc/ssh/ssh_host_rsa_key
 RUN ssh-keygen -q -N "" -t dsa -f /etc/ssh/ssh_host_ecdsa_key
@@ -28,7 +14,7 @@ RUN sed -i "s/#StrictModes.*/StrictModes no/g" /etc/ssh/sshd_config
 RUN mkdir -p /root/.ssh
 RUN ln -s /awx_devel/authorized_keys /root/.ssh/authorized_keys
 
-ADD https://github.com/krallin/tini/releases/download/v0.14.0/tini /tini
-RUN chmod +x /tini
-ENTRYPOINT ["/tini", "--"]
+ENTRYPOINT ["tini", "--"]
 CMD ["/usr/sbin/sshd", "-D"]
+
+EXPOSE 22