diff --git a/public/svgs/macos.svg b/public/svgs/macos.svg
new file mode 100644
index 0000000000..483fa6a17d
--- /dev/null
+++ b/public/svgs/macos.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/svgs/windows.svg b/public/svgs/windows.svg
new file mode 100644
index 0000000000..2c7392e9c9
--- /dev/null
+++ b/public/svgs/windows.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/templates/compose/macos.yaml b/templates/compose/macos.yaml
new file mode 100644
index 0000000000..70cebc1447
--- /dev/null
+++ b/templates/compose/macos.yaml
@@ -0,0 +1,22 @@
+# documentation: https://github.com/dockur/macos
+# slogan: Run macOS in a containerized environment.
+# tags: macos, virtualization, container, os
+# logo: svgs/macos.svg
+# port: 8006
+
+services:
+ macos:
+ image: dockurr/macos
+ volumes:
+ - macos-storage:/storage
+ environment:
+ - SERVICE_FQDN_MACOS_8006
+ - VERSION=15
+ cap_add:
+ - NET_ADMIN
+ stop_grace_period: 2m
+ healthcheck:
+ test: ["CMD", "nc", "-z", "127.0.0.1", "8006"]
+ interval: 2s
+ timeout: 10s
+ retries: 10
diff --git a/templates/compose/windows.yaml b/templates/compose/windows.yaml
new file mode 100644
index 0000000000..ddbc4c3dc7
--- /dev/null
+++ b/templates/compose/windows.yaml
@@ -0,0 +1,22 @@
+# documentation: https://github.com/dockur/windows
+# slogan: Run Windows in a containerized environment.
+# tags: windows, virtualization, container, os
+# logo: svgs/windows.svg
+# port: 8006
+
+services:
+ windows:
+ image: dockurr/windows
+ volumes:
+ - windows-storage:/storage
+ environment:
+ - SERVICE_FQDN_WINDOWS_8006
+ - VERSION=11
+ cap_add:
+ - NET_ADMIN
+ stop_grace_period: 2m
+ healthcheck:
+ test: ["CMD", "nc", "-z", "127.0.0.1", "8006"]
+ interval: 2s
+ timeout: 10s
+ retries: 10