diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 811bc1b83e2070f49862df6758ec3627b27226b1..b785b246ef0bc9a208c56fff416ec7c350ae5869 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,6 +1,6 @@
 # The devcontainer will be based on debian
 # The base container already has entrypoint, vscode user account, etc. out of the box
-FROM mcr.microsoft.com/vscode/devcontainers/base:bullseye
+FROM mcr.microsoft.com/vscode/devcontainers/base:bookworm
 
 # Containerlab version will be set in devcontainer.json
 ARG _CLAB_VERSION
@@ -17,6 +17,7 @@ RUN apt-get update \
     sshpass \
     curl \
     wget \
+    openssl \
     iputils-ping \
     htop \
     zsh \
diff --git a/Makefile b/Makefile
index d811790292c1d3ebaaacd74ee85c3983255f6062..9200d265df328fd35041aaca9a06eb148155f128 100644
--- a/Makefile
+++ b/Makefile
@@ -99,8 +99,8 @@ controller-integration-tests-debug-up: generate-certs containerize-gosdn contain
 controller-integration-tests-debug-down:
 	docker-compose -f dev_env_data/docker-compose/integration-test_docker-compose.yml down
 
-# Warning: Depending on you go configuration might also clean caches, modules and docker containers from your other projects.
+# Warning: Depending on your go and development configuration might also clean caches, modules and docker containers from your other projects.
 clean:
+	rm -r $(BUILD_ARTIFACTS_PATH)
 	$(GOCLEAN)
-	rm -rf $(BUILD_ARTIFACTS_PATH) $(TOOLS_DIR)
 	docker system prune -af