diff --git a/services/Makefile b/services/Makefile
index 8ab68ed..0a223e7 100644
--- a/services/Makefile
+++ b/services/Makefile
@@ -9,14 +9,14 @@ build:
 clean:
 	rm -rf ./bin ./vendor
 
-local:
-	docker-compose up -d
+deploy:
+	docker stack deploy -c docker-stack.yml selfpass
 
 up:
-	docker-compose -f docker-compose.yml -f docker-compose.prod.yml up
+	docker-compose up
 
 upd:
-	docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d
+	docker-compose up -d
 
 down:
 	docker-compose down
diff --git a/services/docker-compose.prod.yml b/services/docker-compose.prod.yml
deleted file mode 100644
index 6e51993..0000000
--- a/services/docker-compose.prod.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-version: "3.7"
-services:
-  server:
-    image: mjfs/selfpass:latest
-    entrypoint:
-      - server
-    volumes:
-      - "/home/selfpass/data:/home/selfpass/data"
-secrets:
-  ca:
-    file: "/home/selfpass/certs/ca.pem"
-  cert:
-    file: "/home/selfpass/certs/server.pem"
-  key:
-    file: "/home/selfpass/certs/server-key.pem"
diff --git a/services/docker-stack.yml b/services/docker-stack.yml
new file mode 100644
index 0000000..a57a269
--- /dev/null
+++ b/services/docker-stack.yml
@@ -0,0 +1,32 @@
+version: "3.7"
+services:
+  server:
+    image: mjfs/selfpass:latest
+    entrypoint:
+      - server
+      - -v
+    ports:
+      - "8080:8080"
+    volumes:
+      - data:/home/selfpass/data
+    secrets:
+      - ca
+      - cert
+      - key
+    deploy:
+      mode: replicated
+      replicas: 1
+      restart_policy:
+        condition: on-failure
+
+secrets:
+  ca:
+    external: true
+  cert:
+    external: true
+  key:
+    external: true
+
+volumes:
+  data:
+    external: true