diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 12e8966..cff306a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -72,17 +72,20 @@ jobs:
           #       go 1.19 is incompatible with the github.com/lucas-clemente/quic-go v0.27.2 dependency
           go-version: '1.18'
 
+      - name: Build lodestar
+        run: docker-compose build lodestar-beacon-node lodestar-beacon-node-follower
+
       - name: Lodestar - Run pre-EIP4844 tests
         run: go run ./tests/pre-4844 lodestar
 
-      # - name: Lodestar - Run Blob transaction tests
-      #   run: go run ./tests/blobtx lodestar
+      - name: Lodestar - Run Blob transaction tests
+        run: go run ./tests/blobtx lodestar
 
-      # - name: Lodestar - Run Fee market spec tests
-      #   run: go run ./tests/fee-market lodestar
+      - name: Lodestar - Run Fee market spec tests
+        run: go run ./tests/fee-market lodestar
 
-      # - name: Lodestar - Run Initial sync tests
-      #   run: go run ./tests/initial-sync lodestar
+      - name: Lodestar - Run Initial sync tests
+        run: go run ./tests/initial-sync lodestar
 
       - name: Collect docker logs on failure
         if: failure()
diff --git a/.gitmodules b/.gitmodules
index 7f3d654..dbdc7f2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,8 +8,8 @@
 	branch = eip-4844
 [submodule "lodestar/lodestar"]
 	path = lodestar/lodestar
-	url = https://github.com/dgcoffman/lodestar
-	branch = dgc/eip-4844
+	url = https://github.com/ChainSafe/lodestar
+	branch = dapplion/eip-4844
 [submodule "erigon/erigon"]
 	path = erigon/erigon
 	url = https://github.com/roberto-bayardo/erigon
diff --git a/lodestar/Dockerfile.lodestar b/lodestar/Dockerfile.lodestar
index 70617a0..f4fcf8d 100644
--- a/lodestar/Dockerfile.lodestar
+++ b/lodestar/Dockerfile.lodestar
@@ -1,11 +1,11 @@
 FROM node:16
 
 RUN apt-get update && \
-    apt-get install -y jq
+    apt-get install -y jq wget
 
 COPY ./lodestar/package.json /app/lodestar/package.json
 COPY ./lodestar/yarn.lock /app/lodestar/yarn.lock
-COPY ./lodestar/trusted_setup.txt /app/lodestar/trusted_setup.txt
+RUN wget https://raw.githubusercontent.com/dgcoffman/lodestar/513b8731eb4735122972e86c2c13dbd21001fe92/trusted_setup.txt -O /app/lodestar/trusted_setup.txt
 
 COPY ./lodestar/packages/api/package.json /app/lodestar/packages/api/package.json
 COPY ./lodestar/packages/beacon-node/package.json /app/lodestar/packages/beacon-node/package.json
diff --git a/lodestar/lodestar b/lodestar/lodestar
index 513b873..6e4bc7f 160000
--- a/lodestar/lodestar
+++ b/lodestar/lodestar
@@ -1 +1 @@
-Subproject commit 513b8731eb4735122972e86c2c13dbd21001fe92
+Subproject commit 6e4bc7f817d93f8035ec688e5c36b6e291fd3d8a