diff --git a/.prowci/Makefile b/.prowci/Makefile
index 7952884fb0..6fc6b4ae83 100644
--- a/.prowci/Makefile
+++ b/.prowci/Makefile
@@ -2,13 +2,13 @@ prow: prow-config prow-secrets prow-services
 .PHONY: prow
 
 prow-config:
-	kubectl create cm config --from-file=config=config.yaml
-	kubectl create cm plugins --from-file=plugins=plugins.yaml
+	kubectl create cm config --from-file=config.yaml=config.yaml
+	kubectl create cm plugins --from-file=plugins.yaml=plugins.yaml
 .PHONY: prow-config
 
 prow-config-update:
-	kubectl create cm config --from-file=config=config.yaml -o yaml --dry-run | kubectl replace -f -
-	kubectl create cm plugins --from-file=plugins=plugins.yaml -o yaml --dry-run | kubectl replace -f -
+	kubectl create cm config --from-file=config.yaml=config.yaml -o yaml --dry-run | kubectl replace -f -
+	kubectl create cm plugins --from-file=plugins.yaml=plugins.yaml -o yaml --dry-run | kubectl replace -f -
 .PHONY: prow-config-update
 
 prow-secrets:
diff --git a/.prowci/README.md b/.prowci/README.md
index a84097b627..343b62a148 100644
--- a/.prowci/README.md
+++ b/.prowci/README.md
@@ -6,10 +6,10 @@ Prow in [upstream docs][0].
 
 ## aks-engine setup
 
-Prow is optimized to run as a Kubernetes application. There are some pre-installation
-steps that need to happen in a new Kubernetes cluster before deploying Prow. These
-involve setting up an Ingress controller and a mechanism to do TLS. The [Azure docs][1]
-explain how to setup Ingress with TLS on top of a Kubernetes cluster in Azure.
+Deploy a new Kubernetes cluster (eg. `az aks create -g acse-test-prow-ci -n prow)
+
+Set up an Ingress controller and a mechanism to do TLS. The [Azure docs][1]
+explain how to setup Ingress with TLS on top of a Kubernetes cluster in Azure. (make sure you specify `--set rbac.create=true` when creating the ingress controller)
 
 A Github webhook also needs to be setup in the repo that points to `dns-name/hook`.
 `dns-name` is the DNS name setup during the DNS configuration of the Ingress controller.
@@ -35,6 +35,5 @@ appropriately on Github. `deck` is installed as the Prow frontend. Last, `tide`
 is also installed that takes care of merging pull requests that pass all tests
 and satisfy a set of label requirements.
 
-
 [0]: https://github.com/kubernetes/test-infra/tree/master/prow#prow
 [1]: https://docs.microsoft.com/en-us/azure/aks/ingress
\ No newline at end of file
diff --git a/.prowci/config.yaml b/.prowci/config.yaml
index 24f6a35ce7..381d66bdab 100644
--- a/.prowci/config.yaml
+++ b/.prowci/config.yaml
@@ -1,7 +1,7 @@
 log_level: debug
 
 tide:
-  # target_url: http://ci-bot-aks-ingress.eastus.cloudapp.azure.com/tide.html
+  # target_url: http://prow-ci-bot-ingress.eastus.cloudapp.azure.com/tide.html
   merge_method:
     Azure/aks-engine: squash
   queries:
diff --git a/.prowci/hook.yaml b/.prowci/hook.yaml
index 8a8582051f..1c28f27d58 100644
--- a/.prowci/hook.yaml
+++ b/.prowci/hook.yaml
@@ -39,7 +39,7 @@ items:
       spec:
         containers:
         - name: hook
-          image: quay.io/kargakis/hook:workaround
+          image: registry.svc.ci.openshift.org/ci/hook:latest
           imagePullPolicy: IfNotPresent
           args:
           - --dry-run=false
diff --git a/.prowci/ingress.yaml b/.prowci/ingress.yaml
index d25d9c7dfb..b56a201f3d 100644
--- a/.prowci/ingress.yaml
+++ b/.prowci/ingress.yaml
@@ -9,9 +9,9 @@ spec:
   tls:
   - secretName: prow-tls
     hosts:
-    - ci-bot-aks-ingress.eastus.cloudapp.azure.com
+    - prow-ci-bot-ingress.eastus.cloudapp.azure.com
   rules:
-  - host: ci-bot-aks-ingress.eastus.cloudapp.azure.com
+  - host: prow-ci-bot-ingress.eastus.cloudapp.azure.com
     http:
       paths:
       - path: /*
diff --git a/.prowci/tide.yaml b/.prowci/tide.yaml
index 5ea89e2232..d15970deba 100644
--- a/.prowci/tide.yaml
+++ b/.prowci/tide.yaml
@@ -38,7 +38,7 @@ items:
         serviceAccountName: tide
         containers:
         - name: tide
-          image: quay.io/kargakis/tide:workaround
+          image: registry.svc.ci.openshift.org/ci/tide:latest
           imagePullPolicy: IfNotPresent
           args:
           - --dry-run=false