diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index 865bd36..87bddeb 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -1,9 +1,9 @@
 version: "2"
 services:
   nextcloud:
-    image: nextcloud:17.0.10
+    image: nextcloud:21
     ports:
-      - 8000:80
+      - "7080:80"
     depends_on:
       - db
     volumes:
diff --git a/wiki/docker-compose.yml b/wiki/docker-compose.yml
new file mode 100644
index 0000000..2364290
--- /dev/null
+++ b/wiki/docker-compose.yml
@@ -0,0 +1,24 @@
+version: "3.3"
+services:
+  wiki:
+    image: mediawiki:1.31
+    restart: unless-stopped
+    volumes:
+      - /srv/wiki/images:/var/www/html/images
+      - /srv/wiki/LocalSettings.php:/var/www/html/LocalSettings.php
+    ports:
+      - "7050:80"
+    depends_on:
+      - db
+  db:
+    image: mariadb
+    restart: unless-stopped
+    volumes:
+      - /srv/wiki/db:/var/lib/mysql
+    environment:
+      MYSQL_DATABASE: golem_wiki
+      MYSQL_USER: golem
+      MYSQL_PASSWORD: Pl4uUBs0LofHNxwXJpTkEg
+      MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
+
+
diff --git a/wordpress/docker-compose.yml b/wordpress/docker-compose.yml
new file mode 100644
index 0000000..c0e8e2b
--- /dev/null
+++ b/wordpress/docker-compose.yml
@@ -0,0 +1,27 @@
+version: "3.3"
+services:
+  wordpress:
+    depends_on:
+      - db
+    image: wordpress:5.7
+    restart: unless-stopped
+    environment:
+      WORDPRESS_DB_HOST: db
+      WORDPRESS_DB_USER: root
+      WORDPRESS_DB_PASSWORD: apVSHnTUrfDIdE5YcFvng
+      WORDPRESS_DB_NAME: golem_wordpress
+    ports:
+      - "7070:80"
+    volumes:
+      - "/srv/wordpress/app:/var/www/html"
+      # - "/srv/sito:/var/www/html/sito"
+  db:
+    image: mariadb:latest
+    restart: unless-stopped
+    environment:
+      MYSQL_ROOT_PASSWORD: apVSHnTUrfDIdE5YcFvng
+    volumes:
+      - "/srv/wordpress/db:/var/lib/mysql"
+      - "/tmp/golem_wordpress_dump.sql:/docker-entrypoint-initdb.d/dump.sql"
+
+