diff --git a/helm-guestbook/templates/deployment.yaml b/helm-guestbook/templates/deployment.yaml
index 980df25..614b610 100644
--- a/helm-guestbook/templates/deployment.yaml
+++ b/helm-guestbook/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "helm-guestbook.fullname" . }}
+  namespace: {{ template "helm-guestbook.fullname" . }}
   labels:
     app: {{ template "helm-guestbook.name" . }}
     chart: {{ template "helm-guestbook.chart" . }}
diff --git a/helm-guestbook/templates/namespace.yaml b/helm-guestbook/templates/namespace.yaml
new file mode 100644
index 0000000..b597da1
--- /dev/null
+++ b/helm-guestbook/templates/namespace.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{ template "helm-guestbook.fullname" . }}
\ No newline at end of file
diff --git a/helm-guestbook/templates/service.yaml b/helm-guestbook/templates/service.yaml
index b7aab0b..58125dd 100644
--- a/helm-guestbook/templates/service.yaml
+++ b/helm-guestbook/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "helm-guestbook.fullname" . }}
+  namespace: {{ template "helm-guestbook.fullname" . }}
   labels:
     app: {{ template "helm-guestbook.name" . }}
     chart: {{ template "helm-guestbook.chart" . }}