diff --git a/xdai-archive.yml b/xdai-archive.yml
index 2b17924d..50a2cc62 100644
--- a/xdai-archive.yml
+++ b/xdai-archive.yml
@@ -11,7 +11,16 @@ services:
     image: nethermindeth/nethermind:trace-db
     restart: always
     stop_grace_period: 1m
-    command: '--JsonRpc.Enabled true --JsonRpc.Host 0.0.0.0 --Metrics.Enabled true --TraceStore.Enabled true --TraceStore.BlocksToKeep 0 --TraceStore.TraceTypes Trace,Rewards'
+    command: |
+      --JsonRpc.Enabled=true
+      --JsonRpc.Host=0.0.0.0
+      --JsonRpc.JwtSecretFile=/jwt.hex
+      --JsonRpc.EngineHost=0.0.0.0
+      --JsonRpc.EnginePort=8551
+      --Metrics.Enabled=true
+      --TraceStore.Enabled=true
+      --TraceStore.BlocksToKeep=0
+      --TraceStore.TraceTypes=Trace,Rewards
     ports:
       - '30303:30303/tcp' # p2p
       - '30303:30303/udp' # p2p
@@ -23,6 +32,7 @@ services:
       - nethermind_db:/nethermind/nethermind_db
       - nethermind_keystore:/nethermind/keystore
       - nethermind_logs:/nethermind/logs
+      - .jwtsecret:/jwt.hex
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     environment:
@@ -42,43 +52,44 @@ services:
       - "traefik.http.routers.xdai-archive.rule=Host(`$DOMAIN`) && PathPrefix(`/xdai-archive`)"
       - "traefik.http.routers.xdai-archive.middlewares=xdai-archive-stripprefix, ipwhitelist"
 
-  xdai-beacon:
-    image: sigp/lighthouse:v3.2.1
-    hostname: lighthouse-xdai
-    restart: always
-    stop_grace_period: 1m
-    command: |
-      lighthouse beacon_node
-      --network gnosis
-      --checkpoint-sync-url https://rpc-gbc.gnosischain.com/
-      --discovery-port 12000
-      --port 13000
-      --eth1-endpoints $XDAI_RPC_URL
-      --datadir /home/.eth2/beaconchaindata
-      --http-address 0.0.0.0
-      --http
-      --enr-address $PUBLIC_IP
-      --enr-udp-port 12000
-      --target-peers $TARGET_PEERS
-      --metrics
-      --metrics-address 0.0.0.0
-      --metrics-allow-origin *
-      --debug-level info
-    ports:
-#     HTTPPORT
-#      - 5052
-#     P2P
-      - '12000:12000/udp'
-      - '13000:13000'
+  xdai_consensus:
+    container_name: xdai_consensus
+    image: sigp/lighthouse:latest-modern
+    restart: unless-stopped
     networks:
       - chains
+    ports:
+      - 9001:9001/tcp # p2p
+      - 9001:9001/udp # p2p
+    expose:
+      - 5054 # metrics
+      - 4000 # http
     volumes:
-      - lighthouse_xdai:/home/.eth2/beaconchaindata
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "100m"
-        max-file: "1"
+      - xdai_consensus:/data
+      - .jwtsecret:/jwt.hex
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+    command: |
+      lighthouse
+      beacon_node
+      --network=gnosis
+      --disable-upnp
+      --datadir=/data
+      --port=9001
+      --http
+      --http-address=0.0.0.0
+      --http-port=4000
+      --target-peers=50
+      --execution-endpoint=http://xdai-archive:8551
+      --execution-jwt=/jwt.hex
+      --debug-level=info
+      --validator-monitor-auto
+      --subscribe-all-subnets
+      --import-all-attestations
+      --metrics
+      --metrics-port=5054
+      --metrics-address=0.0.0.0
+      --checkpoint-sync-url=https://checkpoint.gnosischain.com/
 
 volumes:
   nethermind_db: