diff --git a/installer/local_docker/tasks/main.yml b/installer/local_docker/tasks/main.yml
index 11f5d4a802..424053fee9 100644
--- a/installer/local_docker/tasks/main.yml
+++ b/installer/local_docker/tasks/main.yml
@@ -107,6 +107,7 @@
       POSTGRES_PASSWORD: "{{ pg_password }}"
       POSTGRES_DB: "{{ pg_database }}"
   when: pg_hostname is not defined or pg_hostname == ''
+  register: postgres_container_activate
 
 - name: Activate rabbitmq container
   docker_container:
@@ -115,6 +116,7 @@
     image: rabbitmq:3
     env:
       RABBITMQ_DEFAULT_VHOST: "awx"
+  register: rabbitmq_container_activate
 
 - name: Activate memcached container
   docker_container:
@@ -125,6 +127,7 @@
 - name: Wait for postgres and rabbitmq to activate
   pause:
     seconds: 15
+  when: postgres_container_activate.changed or rabbitmq_container_activate.changed
 
 - name: Set properties without postgres for awx_web
   set_fact: