diff --git a/deployment/kubernetes/config.yaml b/deployment/kubernetes/config.yaml
new file mode 100644
index 0000000..5bbfa78
--- /dev/null
+++ b/deployment/kubernetes/config.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: gisaf-config
+  namespace: gisaf
+data:
+  GISAF__MAP__LNG: "6.178"
+  GISAF__MAP__LAT: "45.8818"
+  GISAF__MAP__ZOOM: "14"
+  GISAF__MAP__PITCH: "40"
diff --git a/deployment/kubernetes/gisaf.yaml b/deployment/kubernetes/gisaf.yaml
index a0c45b0..ad186bd 100644
--- a/deployment/kubernetes/gisaf.yaml
+++ b/deployment/kubernetes/gisaf.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: gisaf-database
+  namespace: gisaf
   labels:
     app: gisaf-database
 spec:
@@ -18,6 +19,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: gisaf-database-deployment
+  namespace: gisaf
   labels:
     app: gisaf-database
 spec:
@@ -27,6 +29,7 @@ spec:
       app: gisaf-database
   template:
     metadata:
+      namespace: gisaf
       labels:
         app: gisaf-database
     spec:
@@ -71,6 +74,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: gisaf-server
+  namespace: gisaf
   labels:
     app: gisaf-server
 spec:
@@ -87,6 +91,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: gisaf-server-deployment
+  namespace: gisaf
   labels:
     app: gisaf-server
 spec:
@@ -96,6 +101,7 @@ spec:
       app: gisaf-server
   template:
     metadata:
+      namespace: gisaf
       labels:
         app: gisaf-server
     spec:
@@ -121,6 +127,9 @@ spec:
               value: redis://gisaf-database
             - name: GISAF__DB__HOST
               value: gisaf-database
+          envFrom:
+            - configMapRef:
+                name: gisaf-config
         - name: gisaf-frontend
           image: code.philo.ydns.eu/philorg/gisaf-frontend:0.5.0-alpha.13
           imagePullPolicy: Always
@@ -137,11 +146,12 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: gisaf-pgdata-pv
+  namespace: gisaf
   labels:
     type: local
     app: gisaf-postgres
 spec:
-  storageClassName: manual
+  storageClassName: local-path
   capacity:
     storage: 2Gi
   accessModes:
@@ -154,11 +164,12 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: gisaf-redis-pv
+  namespace: gisaf
   labels:
     type: local
     app: gisaf-redis
 spec:
-  storageClassName: manual
+  storageClassName: local-path
   capacity:
     storage: 2Gi
   accessModes:
@@ -171,8 +182,9 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: gisaf-pgdata-pvc
+  namespace: gisaf
 spec:
-  storageClassName: manual
+  storageClassName: local-path
   accessModes:
     - ReadWriteMany
   resources:
@@ -184,8 +196,9 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: gisaf-redis-pvc
+  namespace: gisaf
 spec:
-  storageClassName: manual
+  storageClassName: local-path
   accessModes:
     - ReadWriteMany
   resources:
@@ -197,7 +210,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: gisaf
-  namespace: default
+  namespace: gisaf
   #annotations:
   #  kubernetes.io/ingress.class: traefik
   #  #traefik.ingress.kubernetes.io/router.middlewares: default-strip-prefix@kubernetescrd