diff --git a/Makefile b/Makefile
index 8b9fd56bb7041..41a448d344d01 100644
--- a/Makefile
+++ b/Makefile
@@ -59,9 +59,9 @@ devnet-clean:
 	rm -rf ./packages/contracts-bedrock/deployments/devnetL1
 	rm -rf ./.devnet
 	cd ./ops-bedrock && docker-compose down
-	docker volume rm ops-bedrock_l1_data
-	docker volume rm ops-bedrock_l2_data
-	docker volume rm ops-bedrock_op_log
+	docker image ls | grep ops-bedrock_ | cut -d ' ' -f 1 | xargs docker rmi
+	docker volume ls | grep ops-bedrock_ | cut -d ' ' -f 1 | xargs docker volume rm
+
 .PHONY: devnet-clean
 
 test-unit:
diff --git a/ops-bedrock/docker-compose.yml b/ops-bedrock/docker-compose.yml
index 8ccfb964fd6b8..4515bdfef2ede 100644
--- a/ops-bedrock/docker-compose.yml
+++ b/ops-bedrock/docker-compose.yml
@@ -34,7 +34,7 @@ services:
     entrypoint:  # pass the L2 specific flags by overriding the entry-point and adding extra arguments
       - "/bin/sh"
       - "/entrypoint.sh"
-      - "--authrpc.jwt-secret=/config/test-jwt-secret.txt"
+      - "--authrpc.jwtsecret=/config/test-jwt-secret.txt"
 
   op-node:
     depends_on: