diff --git a/commafeed/.env.sample b/commafeed/.env.sample
new file mode 100644
index 0000000..1eec379
--- /dev/null
+++ b/commafeed/.env.sample
@@ -0,0 +1,14 @@
+# Uncomment and change the following variables if you want to use them.
+#RESTART=unless-stopped
+#SYNOLOGY_VOLUME=volume1
+#STACK_NAME=commafeed
+#COMMAFEED_CONTAINER_NAME=CommaFeed
+#COMMAFEED_TAG=latest
+#COMMAFEED_PORT=8082
+#COMMAFEED_APP_ALLOWREGISTRATIONS=false
+#COMMAFEED_APP_PUBLICURL=http://localhost:80/
+#COMMAFEED_POSTGRESQL_CONTAINER_NAME=CommaFeed-PostgreSQL
+#COMMAFEED_POSTGRESQL_TAG=latest
+#COMMAFEED_POSTGRESQL_DATABASE=commafeed
+#COMMAFEED_POSTGRESQL_USER=commafeed
+#COMMAFEED_POSTGRESQL_PASSWORD=commafeed
diff --git a/commafeed/compose.yml b/commafeed/compose.yml
new file mode 100644
index 0000000..78784ce
--- /dev/null
+++ b/commafeed/compose.yml
@@ -0,0 +1,33 @@
+services:
+  # CommaFeed
+  commafeed:
+    container_name: ${COMMAFEED_CONTAINER_NAME:-CommaFeed}
+    image: athou/commafeed:${COMMAFEED_TAG:-latest}
+    restart: ${RESTART:-unless-stopped}
+    healthcheck:
+      test: curl -f http://localhost:8082/ || exit 1
+    environment:
+      CF_DATABASE_DRIVERCLASS: org.postgresql.Driver
+      CF_DATABASE_URL: jdbc:postgresql://commafeed-postgresql:5432/${COMMAFEED_POSTGRESQL_DATABASE:-commafeed}
+      CF_DATABASE_USER: ${COMMAFEED_POSTGRESQL_USER:-commafeed}
+      CF_DATABASE_PASSWORD: ${COMMAFEED_POSTGRESQL_PASSWORD:-commafeed}
+      CF_APP_ALLOWREGISTRATIONS: ${COMMAFEED_APP_ALLOWREGISTRATIONS:-false}
+      CF_APP_PUBLICURL: ${COMMAFEED_APP_PUBLICURL:-http://localhost:80/}
+    ports:
+      - ${COMMAFEED_PORT:-8082}:8082
+    volumes:
+      - /${SYNOLOGY_VOLUME:-volume1}/docker/${STACK_NAME:-commafeed}/${COMMAFEED_CONTAINER_NAME:-CommaFeed}/commafeed/data:/commafeed/data
+
+  # PostgreSQL (for CommaFeed)
+  commafeed-postgresql:
+    container_name: ${COMMAFEED_POSTGRESQL_CONTAINER_NAME:-CommaFeed-PostgreSQL}
+    image: postgres:${COMMAFEED_POSTGRESQL_TAG:-latest}
+    restart: ${RESTART:-unless-stopped}
+    healthcheck:
+      test: ["CMD", "pg_isready", "-q", "-d", "${COMMAFEED_POSTGRESQL_DATABASE:-commafeed}", "-U", "${COMMAFEED_POSTGRESQL_USER:-commafeed}"]
+    environment:
+      POSTGRES_DB: ${COMMAFEED_POSTGRESQL_DATABASE:-commafeed}
+      POSTGRES_USER: ${COMMAFEED_POSTGRESQL_USER:-commafeed}
+      POSTGRES_PASSWORD: ${COMMAFEED_POSTGRESQL_PASSWORD:-commafeed}
+    volumes:
+      - /${SYNOLOGY_VOLUME:-volume1}/docker/${STACK_NAME:-commafeed}/${COMMAFEED_POSTGRESQL_CONTAINER_NAME:-CommaFeed-PostgreSQL}/var/lib/postgresql/data:/var/lib/postgresql/data