diff --git a/ops/komodo/docker-compose.yml b/ops/komodo/docker-compose.yml
index 981d3d2..cbd5d2d 100644
--- a/ops/komodo/docker-compose.yml
+++ b/ops/komodo/docker-compose.yml
@@ -54,10 +54,17 @@ services:
       - KOMODO_TITLE=Kallilabcore
       - KOMODO_SECRET_KEY=${KOMODO_SECRET_KEY}
       - KOMODO_WEBHOOK_SECRET=${KOMODO_SECRET_KEY}
+<<<<<<< HEAD
       - KOMODO_PASSKEY=${KOMODO_PERIPHERY_PASSKEY}
       - KOMODO_DATABASE_ADDRESS=komodo-mongo:27017
       - KOMODO_DATABASE_USERNAME=komodo
       - KOMODO_DATABASE_PASSWORD=${KOMODO_MONGO_PASSWORD}
+=======
+      - KOMODO_DATABASE_ADDRESS=komodo-mongo:27017
+      - KOMODO_DATABASE_USERNAME=komodo
+      - KOMODO_DATABASE_PASSWORD=${KOMODO_MONGO_PASSWORD}
+      - KOMODO_PERIPHERY_PUBLIC_KEY=file:/config/keys/periphery.pub
+>>>>>>> f280f63eb1ec20b684f7418ebc4dd26e99501e08
       - KOMODO_LOG_LEVEL=info
       - KOMODO_LOCAL_AUTH=true
       - KOMODO_JWT_SECRET=${KOMODO_JWT_SECRET}
@@ -86,14 +93,22 @@ services:
     volumes:
       - komodo_keys:/config/keys
       - /var/run/docker.sock:/var/run/docker.sock
+<<<<<<< HEAD
       - /proc:/proc
+=======
+      - /proc:/proc:ro
+>>>>>>> f280f63eb1ec20b684f7418ebc4dd26e99501e08
       - /mnt/user/appdata/komodo/periphery:/etc/komodo
     networks:
       - komodo_net
     environment:
       - PERIPHERY_ROOT_DIRECTORY=/mnt/user/services
+<<<<<<< HEAD
       - PERIPHERY_PASSKEYS=${KOMODO_PERIPHERY_PASSKEY}
       - PERIPHERY_SSL_ENABLED=false
+=======
+      - PERIPHERY_CORE_PUBLIC_KEYS=file:/config/keys/core.pub
+>>>>>>> f280f63eb1ec20b684f7418ebc4dd26e99501e08
       - TZ=Europe/Berlin
     extra_hosts:
       - "git.kaleschke.info:192.168.178.58"