diff --git a/.gitignore b/.gitignore
index 1b6e75e..9f11ca1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 /target/
 /tarpaulin_report.html
 /compose/wasm/
-/servicemesh/threescale_wasm_auth.wasm
+/container/plugin.wasm
 /secrets
 /.vscode/
+/.idea/
diff --git a/Makefile b/Makefile
index 6e0ef21..661caed 100644
--- a/Makefile
+++ b/Makefile
@@ -16,17 +16,17 @@ release-extension: ## Build a release WASM filter and docker image
 .PHONY: build-extension
 build-extension: export IMAGE_VERSION?=latest
 build-extension: build ## Build WASM filter and docker image
-	$(MAKE) -C $(PROJECT_PATH)/servicemesh build
+	$(MAKE) -C $(PROJECT_PATH)/container build
 
 .PHONY: clean-extension
 clean-extension: export IMAGE_VERSION?=latest
 clean-extension: clean ## Clean WASM filter and docker image
-	$(MAKE) -C $(PROJECT_PATH)/servicemesh clean
+	$(MAKE) -C $(PROJECT_PATH)/container clean
 
 .PHONY: push-extension
 push-extension: export IMAGE_VERSION?=latest
 push-extension: ## Push WASM filter docker image
-	$(MAKE) -C $(PROJECT_PATH)/servicemesh push
+	$(MAKE) -C $(PROJECT_PATH)/container push
 
 .PHONY: with-container-do
 with-container-do:
diff --git a/container/Makefile b/container/Makefile
index 6ffa78b..a920d20 100644
--- a/container/Makefile
+++ b/container/Makefile
@@ -4,7 +4,7 @@ DOCKER ?= podman
 
 .PHONY: build
 build:
-	$(DOCKER) build -t quay.io/3scale/threescale-wasm-auth:$(IMAGE_VERSION) -f $(PROJECT_PATH)/Dockerfile $(PROJECT_PATH)
+	$(DOCKER) build -t quay.io/3scale/threescale-wasm-auth:$(IMAGE_VERSION) -f Dockerfile $(PROJECT_PATH)
 
 .PHONY: clean
 clean: