diff --git a/Makefile b/Makefile
index 00f376e..5d616cd 100644
--- a/Makefile
+++ b/Makefile
@@ -13,9 +13,11 @@ all: environment moodle nextcloud
 	cp .env docker/moodle
 	cp .env docker/nextcloud
 	cp .env docker/wordpress
+	cp .env docker/etherpad
 	docker-compose 	-f docker/moodle/moodle.yml \
 					-f docker/nextcloud/nextcloud.yml \
 					-f docker/wordpress/wordpress.yml \
+					-f docker/etherpad/etherpad.yml \
 					-f docker/redis/redis.yml \
 					-f docker/postgresql/postgresql.yml \
 					-f docker/mariadb/mariadb.yml \
@@ -27,6 +29,10 @@ start: all
 
 add-plugins:
 	docker exec -ti isard-apps-nextcloud-app /bin/sh -c "su - www-data -s /bin/sh -c 'PHP_MEMORY_LIMIT=512M php /var/www/html/occ app:install user_saml'"
+	docker exec -ti isard-apps-nextcloud-app /bin/sh -c "su - www-data -s /bin/sh -c 'PHP_MEMORY_LIMIT=512M php /var/www/html/occ app:enable user_saml'"
+	docker exec -ti isard-apps-nextcloud-app /bin/sh -c "su - www-data -s /bin/sh -c 'PHP_MEMORY_LIMIT=512M php /var/www/html/occ app:install ownpad'"
+	docker exec -ti isard-apps-nextcloud-app /bin/sh -c "/ownpad_cfg.sh"
+	docker exec -ti isard-apps-nextcloud-app /bin/sh -c "su - www-data -s /bin/sh -c 'PHP_MEMORY_LIMIT=512M php /var/www/html/occ app:enable ownpad'"
 
 cleanup:
 	docker-compose down
diff --git a/docker/etherpad/etherpad.yml b/docker/etherpad/etherpad.yml
index f6fb0ff..c2f4f08 100644
--- a/docker/etherpad/etherpad.yml
+++ b/docker/etherpad/etherpad.yml
@@ -1,11 +1,11 @@
 version: '3'
 
 services:
-  etherpad:
+  isard-apps-etherpad:
     build:
       context: ${BUILD_ROOT_PATH}/docker/etherpad
       dockerfile: Dockerfile
-    container_name: etherpad
+    container_name: isard-apps-etherpad
     restart: on-failure:10
 #    ports:
 #      - 9001:9001
@@ -28,7 +28,7 @@ services:
       ETHERPAD_DB_PASSWORD: 3th3rpad
       ETHERPAD_API_KEY: your-api-key
       ETHERPAD_DB_NAME: etherpad
-      ETHERPAD_DB_HOST: office-postgres
+      ETHERPAD_DB_HOST: isard-apps-postgresql
     networks:
       - isard_net
 
diff --git a/docker/nextcloud/Dockerfile b/docker/nextcloud/Dockerfile
index befdc18..edfe77a 100644
--- a/docker/nextcloud/Dockerfile
+++ b/docker/nextcloud/Dockerfile
@@ -46,6 +46,7 @@ RUN mkdir -p \
 
 COPY supervisord.conf /
 
+COPY ownpad_cfg.sh /
 ENV NEXTCLOUD_UPDATE=1
 
 CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]
\ No newline at end of file
diff --git a/docker/nextcloud/ownpad_cfg.sh b/docker/nextcloud/ownpad_cfg.sh
new file mode 100755
index 0000000..e04f6ab
--- /dev/null
+++ b/docker/nextcloud/ownpad_cfg.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+cp /var/www/html/resources/config/mimetypemapping.dist.json /var/www/html/config/mimetypemapping.json
+sed -i '$d' /var/www/html/config/mimetypemapping.json
+sed -i '${s/$/,/}' /var/www/html/config/mimetypemapping.json
+echo $'\t"pad": ["application/x-ownpad"],\n\t"calc": ["application/x-ownpad"]\n}' >> /var/www/html/config/mimetypemapping.json
+su - www-data -s /bin/sh -c 'PHP_MEMORY_LIMIT=512M php /var/www/html/occ files:scan --all'
\ No newline at end of file
diff --git a/docker/postgresql/docker-entrypoint-initdb.d/etherpad.sh b/docker/postgresql/docker-entrypoint-initdb.d/etherpad.sh
index 8ff2a22..44d4bd7 100755
--- a/docker/postgresql/docker-entrypoint-initdb.d/etherpad.sh
+++ b/docker/postgresql/docker-entrypoint-initdb.d/etherpad.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" <<-EOSQL
-    CREATE USER $ETHERPAD_POSTGRES_USER SUPERUSER PASSWORD '$ETHERPAD_POSTGRES_USER';
+    CREATE USER $ETHERPAD_POSTGRES_USER SUPERUSER PASSWORD '${ETHERPAD_POSTGRES_PASSWORD}';
     CREATE DATABASE etherpad;
-    GRANT ALL PRIVILEGES ON DATABASE etherpad TO $ETHERPAD_POSTGRES_USER;
+    GRANT ALL PRIVILEGES ON DATABASE etherpad TO ${ETHERPAD_POSTGRES_USER};
 EOSQL
diff --git a/docker/postgresql/docker-entrypoint-initdb.d/keycloak.sh b/docker/postgresql/docker-entrypoint-initdb.d/keycloak.sh
new file mode 100644
index 0000000..66c04b7
--- /dev/null
+++ b/docker/postgresql/docker-entrypoint-initdb.d/keycloak.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" <<-EOSQL
+    CREATE USER $KEYCLOAK_DB_USER SUPERUSER PASSWORD '$KEYCLOAK_DB_PASSWORD';
+    CREATE DATABASE $KEYCLOAK_DB_DATABASE;
+    GRANT ALL PRIVILEGES ON DATABASE $KEYCLOAK_DB_DATABASE TO $KEYCLOAK_DB_USER;
+EOSQL