diff --git a/deployment/build-services.sh b/deployment/build-services.sh
index 78e07c693bd1c86e45ac1e786f51d3f162f0692b..afb5a2feeff507c67387391df453b9a6c6da57c8 100755
--- a/deployment/build-services.sh
+++ b/deployment/build-services.sh
@@ -26,20 +26,22 @@ do
 
 	mkdir -p services/$service
 
-	cp sources/service/{service,deployment}.yaml services/$service
-
 	if [ "$service" != "database" ]
 	then
 		IMAGE="dbogatov/status-site:$service-$TAG"
+		FILE="deployment"
 		PORT="80"
 	else
 		IMAGE="postgres:9.6.3-alpine"
+		FILE="deployment-database"
 		PORT="5432"
 	fi
 
-	sed -i -e "s#__NAME__#$service#g" services/$service/{service,deployment}.yaml
-	sed -i -e "s#__IMAGE__#$IMAGE#g" services/$service/{service,deployment}.yaml
-	sed -i -e "s#__PORT__#$PORT#g" services/$service/{service,deployment}.yaml
+	cp sources/service/{service,$FILE}.yaml services/$service
+
+	sed -i -e "s#__NAME__#$service#g" services/$service/{service,$FILE}.yaml
+	sed -i -e "s#__IMAGE__#$IMAGE#g" services/$service/{service,$FILE}.yaml
+	sed -i -e "s#__PORT__#$PORT#g" services/$service/{service,$FILE}.yaml
 
 done
 
diff --git a/deployment/sources/service/deployment-database.yaml b/deployment/sources/service/deployment-database.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..10cac0aed59f58a8f8a2d473c44e52661ec9dbed
--- /dev/null
+++ b/deployment/sources/service/deployment-database.yaml
@@ -0,0 +1,36 @@
+---
+apiVersion: extensions/v1beta1 
+kind: Deployment 
+metadata:
+  name: __NAME__
+  namespace: status-site 
+  labels:
+    application: __NAME__
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      application: __NAME__
+  template:
+    metadata:
+      labels:
+        application: __NAME__
+    spec:
+      containers:
+        - name: __NAME__
+          image: __IMAGE__
+          imagePullPolicy: Always
+          volumeMounts:
+            - name: database-persistent-storage
+              mountPath: /var/lib/postgresql/data
+          env:
+            - name: POSTGRES_DB
+              value: "statussite"
+            - name: POSTGRES_USER
+              value: "statususer"
+            - name: POSTGRES_PASSWORD
+              value: "relyOn1InternalSwarmNetwork"
+      volumes:
+        - name: database-persistent-storage
+          persistentVolumeClaim:
+            claimName: database-pv-claim
diff --git a/deployment/sources/service/deployment.yaml b/deployment/sources/service/deployment.yaml
index 6f9763f63a3ac067d075b4f9d4614b9721d0b051..c339ccf6b561e3cf28300a4d2e61e0d22a086062 100644
--- a/deployment/sources/service/deployment.yaml
+++ b/deployment/sources/service/deployment.yaml
@@ -24,12 +24,6 @@ spec:
             - name: appsettings
               mountPath: "/run/secrets/"
           env:
-            - name: POSTGRES_DB
-              value: "statussite"
-            - name: POSTGRES_USER
-              value: "statususer"
-            - name: POSTGRES_PASSWORD
-              value: "relyOn1InternalSwarmNetwork"
             - name: ASPNETCORE_ENVIRONMENT
               value: "Production"
       volumes:
diff --git a/deployment/sources/volume-claim.yaml b/deployment/sources/volume-claim.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..16d1bac970e68317f03d49c83c8aa9ac3aa88c03
--- /dev/null
+++ b/deployment/sources/volume-claim.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: database-pv-claim
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 5Gi
+---