diff --git a/kustomization.yaml b/kustomization.yaml
index 613c51491bb..a11a9176773 100644
--- a/kustomization.yaml
+++ b/kustomization.yaml
@@ -2,9 +2,11 @@ bases:
 - ambassador/base
 - argo/base
 - jupyter-web-app/base
+- notebook-controller/base
 #- github.com/swiftdiaries/kubeflow//components/profile-controller/config/default?ref=profiles-controller
 commonLabels:
   app: kubeflow
+
 namespace: kubeflow
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
diff --git a/notebook-controller/base/cluster-role-binding.yaml b/notebook-controller/base/cluster-role-binding.yaml
new file mode 100644
index 00000000000..9adcdd5d6a2
--- /dev/null
+++ b/notebook-controller/base/cluster-role-binding.yaml
@@ -0,0 +1,12 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: notebooks-controller
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: notebooks-controller
+subjects:
+- kind: ServiceAccount
+  name: notebook-controller
+  namespace: kubeflow
diff --git a/notebook-controller/base/cluster-role.yaml b/notebook-controller/base/cluster-role.yaml
new file mode 100644
index 00000000000..303ed3bdb7b
--- /dev/null
+++ b/notebook-controller/base/cluster-role.yaml
@@ -0,0 +1,24 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: notebooks-controller
+rules:
+- apiGroups:
+  - apps
+  resources:
+  - statefulsets
+  - deployments
+  verbs:
+  - '*'
+- apiGroups:
+  - ""
+  resources:
+  - services
+  verbs:
+  - '*'
+- apiGroups:
+  - kubeflow.org
+  resources:
+  - notebooks
+  verbs:
+  - '*'
diff --git a/notebook-controller/base/crd.yaml b/notebook-controller/base/crd.yaml
new file mode 100644
index 00000000000..09dd645f613
--- /dev/null
+++ b/notebook-controller/base/crd.yaml
@@ -0,0 +1,14 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: notebooks.kubeflow.org
+spec:
+  group: kubeflow.org
+  names:
+    kind: Notebook
+    plural: notebooks
+    singular: notebook
+  scope: Namespaced
+  subresources:
+    status: {}
+  version: v1alpha1
diff --git a/notebook-controller/base/deployment.yaml b/notebook-controller/base/deployment.yaml
new file mode 100644
index 00000000000..80c4a7d7281
--- /dev/null
+++ b/notebook-controller/base/deployment.yaml
@@ -0,0 +1,21 @@
+apiVersion: apps/v1beta1
+kind: Deployment
+metadata:
+  name: notebooks-controller
+  namespace: kubeflow
+spec:
+  selector:
+    matchLabels:
+      app: notebooks-controller
+  template:
+    metadata:
+      labels:
+        app: notebooks-controller
+    spec:
+      containers:
+      - command:
+        - /manager
+        image: gcr.io/kubeflow-images-public/notebook-controller:v20190214-v0.4.0-rc.1-142-ge7e38b0f-dirty-73cae0
+        imagePullPolicy: Always
+        name: manager
+      serviceAccountName: notebook-controller
diff --git a/notebook-controller/base/kustomization.yaml b/notebook-controller/base/kustomization.yaml
new file mode 100644
index 00000000000..6a39a665f65
--- /dev/null
+++ b/notebook-controller/base/kustomization.yaml
@@ -0,0 +1,18 @@
+namePrefix: notebooks-controller-
+
+resources:
+- crd.yaml
+- cluster-role.yaml
+- service-account.yaml
+- cluster-role-binding.yaml
+- service.yaml
+- deployment.yaml
+
+commonLabels:
+  kustomize.component: notebooks-controller
+
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+images:
+- name: gcr.io/kubeflow-images-public/notebook-controller
+  newTag: v20190214-v0.4.0-rc.1-142-ge7e38b0f-dirty-73cae0
diff --git a/notebook-controller/base/service-account.yaml b/notebook-controller/base/service-account.yaml
new file mode 100644
index 00000000000..06c400e90e8
--- /dev/null
+++ b/notebook-controller/base/service-account.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app: notebook-controller
+  name: notebook-controller
+  namespace: kubeflow
diff --git a/notebook-controller/base/service.yaml b/notebook-controller/base/service.yaml
new file mode 100644
index 00000000000..5b154c83e33
--- /dev/null
+++ b/notebook-controller/base/service.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: notebooks-controller
+  namespace: kubeflow
+spec:
+  ports:
+  - port: 443
+  selector:
+    app: notebooks-controller