diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-presubmits.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-presubmits.yaml
index 7bd3969f23041..52b497f9edf1e 100644
--- a/ci-operator/jobs/openshift/origin/openshift-origin-presubmits.yaml
+++ b/ci-operator/jobs/openshift/origin/openshift-origin-presubmits.yaml
@@ -851,19 +851,6 @@ presubmits:
     rerun_command: "/test azure"
     trigger: "((?m)^/test( all| azure),?(\\s+|$))"
 
-  - name: test_pull_request_origin_extended_conformance_azure_39
-    agent: jenkins
-    labels:
-      master: ci.openshift.redhat.com
-    always_run: true
-    # TODO: Remove once the job is stable
-    skip_report: true
-    branches:
-    - release-3.9
-    context: ci/openshift-jenkins/azure
-    rerun_command: "/test azure"
-    trigger: "((?m)^/test( all| azure),?(\\s+|$))"
-
   - name: test_pull_request_origin_extended_conformance_azure
     agent: jenkins
     labels:
@@ -876,4 +863,4 @@ presubmits:
     - dockerless-build-temporary
     context: ci/openshift-jenkins/azure
     rerun_command: "/test azure"
-    trigger: "((?m)^/test( all| azure),?(\\s+|$))"
\ No newline at end of file
+    trigger: "((?m)^/test( all| azure),?(\\s+|$))"
diff --git a/cluster/ci/config/prow/config.yaml b/cluster/ci/config/prow/config.yaml
index b33551c535be4..f0054d6d17944 100644
--- a/cluster/ci/config/prow/config.yaml
+++ b/cluster/ci/config/prow/config.yaml
@@ -125,7 +125,6 @@ tide:
     - openshift/descheduler
     - openshift/node-problem-detector
     - openshift/kubernetes-autoscaler
-    - openshift/openshift-azure
     - openshift/openshift-restclient-java
     - openshift/coredns
     - openshift/telemeter
@@ -137,6 +136,15 @@ tide:
     - needs-ok-to-test
     - do-not-merge/work-in-progress
     - do-not-merge/hold
+  - repos:
+    - openshift/openshift-azure
+    labels:
+    - lgtm
+    missingLabels:
+    - needs-ok-to-test
+    - do-not-merge/work-in-progress
+    - do-not-merge/hold
+    - do-not-merge/needs-signoff
 
 prowjob_namespace: ci
 pod_namespace: ci
@@ -2353,6 +2361,45 @@ presubmits:
         args:
           - ./hack/yaml-lint.sh
 
+  - name: ci-pull-openshift-installer-tf-lint
+    trigger: "(?m)^/test tf-lint"
+    rerun_command: "/test tf-lint"
+    context: ci/prow/tf-lint
+    always_run: true
+    skip_report: false
+    agent: kubernetes
+    decorate: true
+    spec:
+      containers:
+      - image: quay.io/coreos/tflint
+        env:
+        - name: IS_CONTAINER
+          value: 'TRUE'
+        command:
+          - sh
+        args:
+          - ./hack/tf-lint.sh
+
+  - name: go-vet
+    trigger: "(?m)^/test go-vet"
+    rerun_command: "/test go-vet"
+    context: ci/prow/go-vet
+    always_run: true
+    skip_report: false
+    agent: kubernetes
+    decorate: true
+    spec:
+      containers:
+      - image: quay.io/coreos/golang-testing
+        env:
+        - name: IS_CONTAINER
+          value: 'TRUE'
+        command:
+        - sh
+        args:
+        - ./hack/go-vet.sh
+        - "./installer/..."
+
   openshift/ci-vm-operator:
   - name: pull-ci-vm-operator-build
     agent: kubernetes
@@ -2698,12 +2745,6 @@ postsubmits:
       master: ci.openshift.redhat.com
     branches:
     - release-3.10
-  - name: test_branch_origin_extended_conformance_azure_39
-    agent: jenkins
-    labels:
-      master: ci.openshift.redhat.com
-    branches:
-    - release-3.9
   - name: test_branch_origin_extended_conformance_azure_310
     agent: jenkins
     labels:
@@ -3995,10 +4036,6 @@ periodics:
     agent: jenkins
     labels:
         master: ci.openshift.redhat.com
-  - name: azure_build_node_image_centos_39
-    agent: jenkins
-    labels:
-        master: ci.openshift.redhat.com
   - name: azure_build_node_image_centos
     agent: jenkins
     labels:
@@ -4013,10 +4050,6 @@ periodics:
     agent: jenkins
     labels:
         master: ci.openshift.redhat.com
-  - name: azure_build_node_image_rhel_39
-    agent: jenkins
-    labels:
-        master: ci.openshift.redhat.com
 
 - name: ami_build_ose_master
   agent: jenkins
diff --git a/cluster/ci/config/prow/plugins.yaml b/cluster/ci/config/prow/plugins.yaml
index 1fff33a7d79aa..8008b3ba125bc 100644
--- a/cluster/ci/config/prow/plugins.yaml
+++ b/cluster/ci/config/prow/plugins.yaml
@@ -118,6 +118,10 @@ config_updater:
 sigmention:
   regexp: (?m)@openshift/sig-([\w-]*)
 
+label:
+  additional_labels:
+  - do-not-merge/needs-signoff
+
 external_plugins:
   openshift:
   - name: refresh
@@ -183,6 +187,8 @@ plugins:
   - trigger
 
   openshift/azure-misc:
+  - approve
+  - blunderbuss
   - golint
   - trigger
 
@@ -324,10 +330,6 @@ plugins:
   - wip
   - yuks
 
-  openshift/azure-misc:
-  - approve
-  - blunderbuss
-
   kubernetes-incubator/cri-o:
   - trigger
 
diff --git a/projects/azure/acs-engine/test-image-builds/Dockerfiles/3.9/Dockerfile b/projects/azure/acs-engine/test-image-builds/Dockerfiles/3.9/Dockerfile
deleted file mode 100644
index 5cf9b00929505..0000000000000
--- a/projects/azure/acs-engine/test-image-builds/Dockerfiles/3.9/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM quay.io/deis/go-dev:v1.9.1
-
-RUN apt-get update && \
-    wget https://github.com/openshift/origin/releases/download/v3.9.0/openshift-origin-client-tools-v3.9.0-191fece-linux-64bit.tar.gz && \
-    tar -xzf openshift-origin-client-tools-v3.9.0-191fece-linux-64bit.tar.gz && \
-    cp ./openshift-origin-client-tools-v3.9.0-191fece-linux-64bit/oc /usr/local/bin/ && \
-    rm -rf openshift-origin-client-tools-v3.9.0-191fece-linux-64bit.tar.gz openshift-origin-client-tools-v3.9.0-191fece-linux-64bit
diff --git a/projects/azure/acs-engine/test-image-builds/build-3.9.yaml b/projects/azure/acs-engine/test-image-builds/build-3.9.yaml
deleted file mode 100644
index 55f2c54dda1b0..0000000000000
--- a/projects/azure/acs-engine/test-image-builds/build-3.9.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-kind: BuildConfig
-apiVersion: v1
-metadata:
-  name: acs-engine-tests-3.9
-  namespace: azure
-spec:
-  successfulBuildsHistoryLimit: 1
-  failedBuildsHistoryLimit: 2
-  output:
-    to:
-      kind: ImageStreamTag
-      name: "acs-engine-tests:v3.9"
-  source:
-    contextDir: "projects/azure/acs-engine/test-image-builds/Dockerfiles/3.9/"
-    git:
-      uri: "https://github.com/openshift/release"
-      ref: "master"
-    type: Git
-  strategy:
-    dockerStrategy:
-      from:
-        kind: DockerImage
-        name: quay.io/deis/go-dev:v1.9.1
-      imageOptimizationPolicy: SkipLayers
-  triggers:
-  - type: ConfigChange
diff --git a/projects/azure/config-updater/config-updater.yaml b/projects/azure/config-updater/config-updater.yaml
index 0b65858224236..406fe28d041c2 100644
--- a/projects/azure/config-updater/config-updater.yaml
+++ b/projects/azure/config-updater/config-updater.yaml
@@ -14,7 +14,6 @@ items:
       targets:
       - projects/azure/acs-engine/binary-build.yaml
       - projects/azure/acs-engine/test-image-builds/build-3.10.yaml
-      - projects/azure/acs-engine/test-image-builds/build-3.9.yaml
       - projects/azure/acs-engine/test-image-builds/is-common.yaml
       - projects/azure/azure-purge/cronjob.yaml
       - projects/azure/base-images/alpine.yaml