diff --git a/kubernetes/contrib/components/awx/values.yaml b/kubernetes/contrib/components/awx/values.yaml
index 44c5741..c30999f 100755
--- a/kubernetes/contrib/components/awx/values.yaml
+++ b/kubernetes/contrib/components/awx/values.yaml
@@ -88,22 +88,22 @@
 service:
   rmqmgmt:
     type: ClusterIP
-    portName: rmqmgmt
+    portName: http-rmqmgmt
     internalPort: 15672
     externalPort: 15672
   web:
     type: ClusterIP
-    portName: web
+    portName: http-web
     internalPort: 8052
     externalPort: 8052
   rabbitmq:
     type: ClusterIP
     http:
-      portName: http
+      portName: http-rmq
       internalPort: 15672
       externalPort: 15672
     amqp:
-      portName: amqp
+      portName: tcp-amqp
       internalPort: 5672
       externalPort: 5672
 
@@ -114,3 +114,7 @@
   nameOverride: awx
   roles:
     - read
+
+wait_for_job_container:
+  containers:
+    - '{{ include "common.name" . }}-mgnt'