diff --git a/ci-operator/config/openshift/cluster-api-provider-aws/master.json b/ci-operator/config/openshift/cluster-api-provider-aws/master.json
new file mode 100644
index 0000000000000..f94e2fb374807
--- /dev/null
+++ b/ci-operator/config/openshift/cluster-api-provider-aws/master.json
@@ -0,0 +1,54 @@
+{
+  "tag_specification": {
+    "cluster": "https://api.ci.openshift.org",
+    "namespace": "openshift",
+    "name": "origin-v3.11",
+    "tag": "",
+    "tag_overrides": {}
+  },
+  "base_images": {
+    "base": {
+      "cluster": "https://api.ci.openshift.org",
+      "namespace": "openshift",
+      "name": "origin-v3.11",
+      "tag": "base"
+    }
+  },
+  "test_base_image": {
+    "cluster": "https://api.ci.openshift.org",
+    "namespace": "openshift",
+    "name": "release",
+    "tag": "golang-1.10"
+  },
+
+  "canonical_go_repository": "github.com/openshift/cluster-api-provider-aws",
+
+  "binary_build_commands": "make build",
+
+  "images": [
+    {
+      "from": "base",
+      "to": "machine-controller",
+      "dockerfile_path": "cmd/machine-controller/Dockerfile"
+    },
+    {
+      "from": "base",
+      "to": "cluster-controller",
+      "dockerfile_path": "cmd/cluster-controller/Dockerfile"
+    }
+  ],
+  "tests": [
+    {
+      "as": "unit",
+      "from": "src",
+      "commands": "make test"
+    }
+  ],
+
+  "resources": {
+    "*": {
+      "requests": { "cpu": "100m", "memory": "200Mi" },
+      "limits":   { "cpu": "2",    "memory": "4Gi" }
+    }
+  }
+}
diff --git a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-postsubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-postsubmits.yaml
new file mode 100644
index 0000000000000..ce0e70acd36af
--- /dev/null
+++ b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-postsubmits.yaml
@@ -0,0 +1,27 @@
+postsubmits:
+  openshift/cluster-api-provider-aws:
+  - name: branch-ci-openshift-cluster-api-provider-aws-images
+    agent: kubernetes
+    labels:
+      artifacts: images
+    branches:
+    - master
+    decorate: true
+    skip_cloning: true
+    spec:
+      serviceAccountName: ci-operator
+      containers:
+      - name: test
+        image: ci-operator:latest
+        env:
+        - name: CONFIG_SPEC
+          valueFrom:
+            configMapKeyRef:
+              name: ci-operator-openshift-cluster-api-provider
+              key: master.json
+        command:
+        - ci-operator
+        args:
+        - --artifact-dir=$(ARTIFACTS)
+        - --target=[images]
+        - --promote
diff --git a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-presubmits.yaml
new file mode 100644
index 0000000000000..ca9b9eb5fc05c
--- /dev/null
+++ b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-presubmits.yaml
@@ -0,0 +1,29 @@
+presubmits:
+  openshift/cluster-api-provider-aws:
+  - name: pull-ci-origin-cluster-api-provider-aws-unit
+    agent: kubernetes
+    context: ci/prow/unit
+    branches:
+    - master
+    rerun_command: "/test unit"
+    always_run: true
+    trigger: "((?m)^/test( all| unit),?(\\s+|$))"
+    decorate: true
+    skip_cloning: true
+    spec:
+      serviceAccountName: ci-operator
+      containers:
+      - name: test
+        image: ci-operator:latest
+        env:
+        - name: CONFIG_SPEC
+          valueFrom:
+            configMapKeyRef:
+              name: ci-operator-openshift-cluster-api-provider-aws
+              key: master.json
+        command:
+        - ci-operator
+        args:
+        - --artifact-dir=$(ARTIFACTS)
+        - --target=unit
+        - --target=[images]
diff --git a/cluster/ci/config/prow/plugins.yaml b/cluster/ci/config/prow/plugins.yaml
index e6f3653e0ff76..ec75964492977 100644
--- a/cluster/ci/config/prow/plugins.yaml
+++ b/cluster/ci/config/prow/plugins.yaml
@@ -152,6 +152,8 @@ config_updater:
       name: ci-operator-openshift-cluster-ingress-operator
     ci-operator/config/openshift/cluster-dns-operator/*.json:
       name: ci-operator-openshift-cluster-dns-operator
+    ci-operator/config/openshift/cluster-api-provider-aws/master.json:
+      name: ci-operator-openshift-cluster-api-provider-aws
 
 sigmention:
   regexp: (?m)@openshift/sig-([\w-]*)