diff --git a/compose.yaml b/compose.yaml
index 3b3c5bc..508d30d 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -19,7 +19,7 @@ services:
       - local-da
 
   local-da:
+    image: ghcr.io/rollkit/local-da:v0.2.1
     container_name: local-da
-    image: ghcr.io/rollkit/local-da:aa37274
     ports:
       - "7980:7980"
diff --git a/main.star b/main.star
index 61750fb..a4e26c2 100644
--- a/main.star
+++ b/main.star
@@ -20,7 +20,7 @@ def run(plan):
     local_da = plan.add_service(
         name="local-da",
         config=ServiceConfig(
-            image="ghcr.io/rollkit/local-da:aa37274",
+            image="ghcr.io/rollkit/local-da:v0.2.1",
             ports=local_da_ports,
             public_ports=local_da_ports,
         ),
@@ -53,7 +53,8 @@ def run(plan):
     gm = plan.add_service(
         name="gm",
         config=ServiceConfig(
-            image="ghcr.io/rollkit/gm:49147e3",
+            # Using rollkit version v0.13.5
+            image="ghcr.io/rollkit/gm:05bd40e",
             cmd=["/bin/sh", "-c", " ".join(gm_start_cmd)],
             ports=gm_ports,
             public_ports=gm_ports,