diff --git a/Dockerfile b/Dockerfile
index 720615cab..184aa72d5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,7 +37,7 @@ ENTRYPOINT ["/usr/local/bin/fulcio-server", "serve"]
 
 # debug compile options & debugger
 FROM deploy as debug
-RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.0
+RUN go install github.com/go-delve/delve/cmd/dlv@v1.22.0
 
 # overwrite server and include debugger
 COPY --from=builder /opt/app-root/src/server_debug /usr/local/bin/fulcio-server
diff --git a/docker-compose.debug.yml b/docker-compose.debug.yml
index 94e3b03c3..a0e7da6b5 100644
--- a/docker-compose.debug.yml
+++ b/docker-compose.debug.yml
@@ -19,7 +19,7 @@ services:
     build:
       context: .
       target: "debug"
-    command: [
+    entrypoint: [
       "dlv",
       "exec",
       "--listen=:2345",
@@ -30,10 +30,13 @@ services:
       "/usr/local/bin/fulcio-server",
       "serve",
       "--host=0.0.0.0",
-      "--port=3000",
+      "--port=5555",
+      "--grpc-port=5554",
+      "--ca=ephemeralca",
       ]
     restart: always # keep the server running
     ports:
-      - "3000:3000"
+      - "5555:5555"
+      - "5554:5554"
       - "2345:2345"
-      - "2112:2112"
+      - "${FULCIO_METRICS_PORT:-2112}:2112"