diff --git a/Makefile b/Makefile
index f0fad6011e..1b3742972f 100644
--- a/Makefile
+++ b/Makefile
@@ -139,6 +139,10 @@ AWS_SDK_GO_VERSION ?= $(shell awk '/github.com\/aws\/aws-sdk-go / { print $$2 }'
 # NOTE(muvaf): ACK Code Generator is a separate Go module, hence we need to
 # be in its root directory to call "go run" properly.
 services: $(GOIMPORTS)
+	@if [ ! -d "$(WORK_DIR)" ]; then \
+		$(INFO) creating $(WORK_DIR) folder; \
+		mkdir $(WORK_DIR); \
+	fi
 	@if [ ! -d "$(WORK_DIR)/code-generator" ]; then \
 		cd $(WORK_DIR) && git clone "$(CODE_GENERATOR_REPO)"; \
 	fi
diff --git a/build b/build
index 2fc4678a45..2d1bdbe92e 160000
--- a/build
+++ b/build
@@ -1 +1 @@
-Subproject commit 2fc4678a45e227e73719a84dfe88dadce47efafb
+Subproject commit 2d1bdbe92eb98b78a5bf78543f26b9a7fe9f7f1b