diff --git a/deployment/kubernetes/gisaf.yaml b/deployment/kubernetes/gisaf.yaml
index bcb8549..df1aaab 100644
--- a/deployment/kubernetes/gisaf.yaml
+++ b/deployment/kubernetes/gisaf.yaml
@@ -14,52 +14,57 @@ spec:
     app: gisaf-database
 
 ---
-apiVersion: v1
-kind: Pod
+apiVersion: apps/v1
+kind: Deployment
 metadata:
-  name: gisaf-database
-  annotations:
-    io.kubernetes.cri-o.SandboxID/gisaf-database: gisaf-cri-o
-    io.kubernetes.cri-o.SandboxID/gisaf-redis: gisaf-cri-o
-    io.podman.annotations.infra.name: gisaf-infra
+  name: gisaf-database-deployment
   labels:
     app: gisaf-database
 spec:
-  hostAliases:
-    - ip: "127.0.0.1"
-      hostnames:
-        - "gisaf-redis"
-        - "gisaf-database"
-  containers:
-    - name: gisaf-database
-      image: code.philo.ydns.eu/philorg/gisaf-database:latest
-      imagePullPolicy: Always
-      args:
-        - postgres
-      volumeMounts:
-        - mountPath: /var/lib/postgresql/data
-          name: gisaf-pgdata
-      ports:
-        - containerPort: 5432
-          name: psql
-    - image: docker.io/library/redis:alpine
-      imagePullPolicy: Always
-      name: gisaf-redis
-      args:
-        - redis-server
-      volumeMounts:
-        - mountPath: /data
+  replicas: 1
+  selector:
+    matchLabels:
+      app: gisaf-database
+  template:
+    metadata:
+      labels:
+        app: gisaf-database
+    spec:
+      hostAliases:
+        - ip: "127.0.0.1"
+          hostnames:
+            - "gisaf-redis"
+            - "gisaf-database"
+      containers:
+        - name: gisaf-database
+          image: code.philo.ydns.eu/philorg/gisaf-database:latest
+          imagePullPolicy: Always
+          args:
+            - postgres
+          volumeMounts:
+            - mountPath: /var/lib/postgresql/data
+              name: gisaf-pgdata
+          ports:
+            - containerPort: 5432
+              name: psql
+        - image: docker.io/library/redis:alpine
+          imagePullPolicy: Always
           name: gisaf-redis
-      ports:
-        - containerPort: 6379
-          name: redis
-  volumes:
-    - name: gisaf-pgdata
-      persistentVolumeClaim:
-        claimName: gisaf-pgdata-pvc
-    - name: gisaf-redis
-      persistentVolumeClaim:
-        claimName: gisaf-redis-pvc
+          args:
+            - redis-server
+          volumeMounts:
+            - mountPath: /data
+              name: gisaf-redis
+          ports:
+            - containerPort: 6379
+              name: redis
+      volumes:
+        - name: gisaf-pgdata
+          persistentVolumeClaim:
+            claimName: gisaf-pgdata-pvc
+        - name: gisaf-redis
+          persistentVolumeClaim:
+            claimName: gisaf-redis-pvc
 
 ---
 apiVersion: v1
@@ -78,49 +83,54 @@ spec:
   #type: NodePort
 
 ---
-apiVersion: v1
-kind: Pod
+apiVersion: apps/v1
+kind: Deployment
 metadata:
-  name: gisaf-server
-  annotations:
-    io.kubernetes.cri-o.SandboxID/gisaf-backend: gisaf-cri-o
-    io.kubernetes.cri-o.SandboxID/gisaf-frontend: gisaf-cri-o
-    io.podman.annotations.infra.name: gisaf-infra
+  name: gisaf-server-deployment
   labels:
     app: gisaf-server
 spec:
-  hostAliases:
-    - ip: "127.0.0.1"
-      hostnames:
-        - "gisaf-frontend"
-        - "gisaf-backend"
-  initContainers:
-    - name: gisaf-backend-initdb
-      image: code.philo.ydns.eu/philorg/gisaf-backend:latest
-      imagePullPolicy: Always
-      command: ["gisaf", "create-db"]
-      env:
-        - name: GISAF__DB__HOST
-          value: gisaf-database
-  containers:
-    - name: gisaf-backend
-      image: code.philo.ydns.eu/philorg/gisaf-backend:latest
-      imagePullPolicy: Always
-      env:
-        - name: GISAF__GISAF_LIVE__REDIS
-          value: redis://gisaf-database
-        - name: GISAF__DB__HOST
-          value: gisaf-database
-    - name: gisaf-frontend
-      image: code.philo.ydns.eu/philorg/gisaf-frontend:latest
-      imagePullPolicy: Always
-      args:
-        - nginx
-        - -g
-        - daemon off;
-      ports:
-        - containerPort: 80
-          hostPort: 8899
+  replicas: 2
+  selector:
+    matchLabels:
+      app: gisaf-server
+  template:
+    metadata:
+      labels:
+        app: gisaf-server
+    spec:
+      hostAliases:
+        - ip: "127.0.0.1"
+          hostnames:
+            - "gisaf-frontend"
+            - "gisaf-backend"
+      initContainers:
+        - name: gisaf-backend-initdb
+          image: code.philo.ydns.eu/philorg/gisaf-backend:0.5.0-alpha.5
+          imagePullPolicy: Always
+          command: ["gisaf", "create-db"]
+          env:
+            - name: GISAF__DB__HOST
+              value: gisaf-database
+      containers:
+        - name: gisaf-backend
+          image: code.philo.ydns.eu/philorg/gisaf-backend:0.5.0-alpha.5
+          imagePullPolicy: Always
+          env:
+            - name: GISAF__GISAF_LIVE__REDIS
+              value: redis://gisaf-database
+            - name: GISAF__DB__HOST
+              value: gisaf-database
+        - name: gisaf-frontend
+          image: code.philo.ydns.eu/philorg/gisaf-frontend:0.5.0-alpha.12
+          imagePullPolicy: Always
+          args:
+            - nginx
+            - -g
+            - daemon off;
+          ports:
+            - containerPort: 80
+              #hostPort: 8899
 
 ---
 apiVersion: v1