diff --git a/src/autoscaler/Makefile b/src/autoscaler/Makefile
index 0483c4840b..78bb2afcd2 100644
--- a/src/autoscaler/Makefile
+++ b/src/autoscaler/Makefile
@@ -158,7 +158,7 @@ clean:
 mta-deploy: mta-build build-extension-file
 	$(MAKE) -f metricsforwarder/Makefile set-security-group
 	@echo "Deploying with extension file: $(EXTENSION_FILE)"
-	@cf deploy $(MAKEFILE_DIR)/$(DEST)/*.mtar --version-rule ALL -f --delete-services -e $(EXTENSION_FILE)
+	@cf deploy $(DEST)/*.mtar --version-rule ALL -f --delete-services -e $(EXTENSION_FILE)
 
 
 build-extension-file:
@@ -173,10 +173,11 @@ mta-logs:
 .PHONY: mta-build
 mta-build: mta-build-clean
 	@echo "bulding mtar file for version: $(VERSION)"
-	@cp mta.tpl.yaml mta.yaml
-	@sed -i 's/VERSION/$(VERSION)/g' mta.yaml
-	@mbt build
-	@mkdir -p "${PWD}/$(DEST)" && mv ${PWD}/mta_archives/com.github.cloudfoundry.app-autoscaler-release_$(VERSION).mtar ${PWD}/$(DEST)/app-autoscaler-release-v$(VERSION).mtar
+	cp mta.tpl.yaml mta.yaml
+	sed -i 's/VERSION/$(VERSION)/g' mta.yaml
+	mkdir -p $(DEST)
+	mbt build
+	@mv mta_archives/com.github.cloudfoundry.app-autoscaler-release_$(VERSION).mtar $(DEST)/app-autoscaler-release-v$(VERSION).mtar
 
 mta-build-clean:
 	rm -rf mta_archives