diff --git a/README.md b/README.md
index aacc2a6..6b0caec 100644
--- a/README.md
+++ b/README.md
@@ -360,6 +360,9 @@ A collection of delicious docker recipes.
 - [x] n8nio/n8n
 - [x] notaitech/nudenet
 - [x] odoo
+- [x] ohmyform
+    - [x] ohmyform/api
+    - [x] ohmyform/ui
 - [x] osixia/openldap
 - [x] openresty/openresty
 - [x] kylemanna/openvpn
diff --git a/ohmyform/README.md b/ohmyform/README.md
new file mode 100644
index 0000000..300f486
--- /dev/null
+++ b/ohmyform/README.md
@@ -0,0 +1,7 @@
+ohmyform
+========
+
+[OhMyForm][1] is 100% open source software to generate professional grade
+mobile ready forms, surveys and questionnaires.
+
+[1]: https://ohmyform.com/
diff --git a/ohmyform/docker-compose.yml b/ohmyform/docker-compose.yml
new file mode 100644
index 0000000..0c3207d
--- /dev/null
+++ b/ohmyform/docker-compose.yml
@@ -0,0 +1,58 @@
+version: "3.8"
+
+services:
+
+  redis:
+    image: redis:alpine
+    command: --save 900 1
+    volumes:
+      - ./data/redis:/data
+    restart: unless-stopped
+
+  postgres:
+    image: postgres:13-alpine
+    volumes:
+      - ./data/postgres:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_USER=ohmyform
+      - POSTGRES_PASSWORD=ohmyform
+      - POSTGRES_DB=ohmyform
+    restart: unless-stopped
+
+  mailhog:
+    image: mailhog/mailhog
+    ports:
+      - "5051:8025"
+    restart: unless-stopped
+
+  api:
+    image: ohmyform/api
+    ports:
+      - "8090:5000"
+    environment:
+      - CREATE_ADMIN=TRUE
+      - ADMIN_EMAIL=admin@local.host
+      - ADMIN_USERNAME=admin
+      - ADMIN_PASSWORD=admin
+      - DATABASE_DRIVER=postgres
+      - DATABASE_URL=postgresql://ohmyform:ohmyform@postgres:5432/ohmyform
+      - MAILER_URI=smtp://mailhog:1025
+      - REDIS_URL=redis://redis
+      - PORT=5000
+    depends_on:
+      - mailhog
+      - postgres
+      - redis
+    restart: unless-stopped
+
+  ui:
+    image: ohmyform/ui
+    ports:
+      - "8080:5000"
+    environment:
+      - ENDPOINT=http://localhost:8090/graphql
+      - SERVER_ENDPOINT=http://api:5000/graphql
+      - PORT=5000
+    depends_on:
+      - api
+    restart: unless-stopped
diff --git a/portainer/README.md b/portainer/README.md
index 02a09a1..8e0140f 100644
--- a/portainer/README.md
+++ b/portainer/README.md
@@ -6,14 +6,17 @@ portainer
 ## docker-compose.yml
 
 ```yaml
-portainer:
-  image: portainer/portainer
-  ports:
-    - "9000:9000"
-  volumes:
-    - ./data:/data
-    - /var/run/docker.sock:/var/run/docker.sock
-  restart: always
+version: "3.8"
+services:
+  portainer:
+    image: portainer/portainer-ce
+    ports:
+      - "8000:8000"
+      - "9000:9000"
+    volumes:
+      - ./data:/data
+      - /var/run/docker.sock:/var/run/docker.sock
+    restart: unless-stopped
 ```
 
-[1]: http://portainer.io/
+[1]: https://documentation.portainer.io/v2.0/deploy/ceinstalldocker/
diff --git a/portainer/docker-compose.yml b/portainer/docker-compose.yml
index 54ed0fb..c3412c4 100644
--- a/portainer/docker-compose.yml
+++ b/portainer/docker-compose.yml
@@ -1,8 +1,11 @@
-portainer:
-  image: portainer/portainer
-  ports:
-    - "9000:9000"
-  volumes:
-    - ./data:/data
-    - /var/run/docker.sock:/var/run/docker.sock
-  restart: always
+version: "3.8"
+services:
+  portainer:
+    image: portainer/portainer-ce
+    ports:
+      - "8000:8000"
+      - "9000:9000"
+    volumes:
+      - ./data:/data
+      - /var/run/docker.sock:/var/run/docker.sock
+    restart: unless-stopped