diff --git a/dhcp-server/templates/_helpers.tpl b/dhcp-server/templates/_helpers.tpl
new file mode 100644
index 0000000..bcbd46d
--- /dev/null
+++ b/dhcp-server/templates/_helpers.tpl
@@ -0,0 +1,25 @@
+
+{{- /* 
+ Copyright 2017-present Open Networking Foundation 
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. 
+ */ -}}
+
+{{- define "dhcp-server.release_labels" }}
+app: {{ printf "%s-%s" .Release.Name .Chart.Name | trunc 63 }}
+version: {{ .Chart.Version }}
+release: {{ .Release.Name }}
+{{- end }}
+{{- define "dhcp-server.full_name" -}}
+{{- printf "%s-%s" .Release.Name .Chart.Name | trunc 63 -}}
+{{- end -}}
diff --git a/dhcp-server/templates/configmap.yaml b/dhcp-server/templates/configmap.yaml
new file mode 100644
index 0000000..8436ab6
--- /dev/null
+++ b/dhcp-server/templates/configmap.yaml
@@ -0,0 +1,22 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: dhcp-server
+  labels:
+    {{- include "dhcp-server.release_labels" . | indent 4 }}
+data:
+  config: | {{ .Values.config | indent 4 }}
diff --git a/dhcp-server/templates/deployment.yaml b/dhcp-server/templates/deployment.yaml
new file mode 100644
index 0000000..9409a41
--- /dev/null
+++ b/dhcp-server/templates/deployment.yaml
@@ -0,0 +1,47 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: dhcp-server
+  labels:
+    app: dhcp-server
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: dhcp-server
+    spec:
+      containers:
+        - name: dhcp-server
+          image: {{ .Values.pull_docker_registry }}{{ .Values.images.dhcp_server.repository }}:{{ .Values.images.dhcp_server.tag }}
+          imagePullPolicy: {{ .Values.images.dhcp_server.pullPolicy }}
+          #command: ["/bin/bash", "-", "sleep 86400"]
+          ports:
+            - containerPort: 67
+              port: 67
+              protocol: UDP
+          volumeMounts:
+            - name: dhcp-server
+              mountPath: /data/dhcpd.conf
+              subPath: mymounts/dhcpd.conf
+      volumes:
+        - name: dhcp-server
+          configMap:
+            name: dhcp-server
+            items:
+             - key: config
+               path: mymounts/dhcpd.conf
diff --git a/dhcp-server/templates/dhcp-service.yaml b/dhcp-server/templates/dhcp-service.yaml
new file mode 100644
index 0000000..6bc8025
--- /dev/null
+++ b/dhcp-server/templates/dhcp-service.yaml
@@ -0,0 +1,29 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: "dhcp-server"
+  labels:
+    {{- include "dhcp-server.release_labels" . | indent 4 }}
+spec:
+  type: ClusterIP
+  ports:
+  - port: 67
+    name: dhcp
+    targetPort: 67
+    protocol: UDP
+  selector:
+    app: "dhcp-server"